I too would vote for the Voyager because of the layout and the standard cabin size (what we had on 2005) WC.
Debbie, you will LOVE the cirumnavigation of SA. One of our VERY favorite cruises! On SA (Mariner) we were able to take advantage of the one category upgrade since we booked SA while still on the WC and went for the Category C...now that is my very favorite cabin! Just like A & B but without the butler.