I would definitely go with South Africa as your first choice, but if you think you might do more than one of the above trips I can highly recommend Sossusvlei Mountain Lodge in Namibia for a different African experience - The Sossusvlei dunes are fantastic. Animal viewing includes springbok, oryx, zebra, ostrich, jackal, cape fox and many birds.
The lodge is very nice - accomodations are in 10 stone and glass villas - features include a shaded private terrace, contemporary split-level bedroom and living room with fireplace, fully-stocked bar, spotting scope, bath w/ double sinks and shower and also an outdoor shower. The main lodge area has a bar, sitting room with multiple couches and conversation areas, upstairs library with CD and book collection, swimming pool and wraparound veranda where meals are served. The lodge also has a small observatory and they typically have visiting astronomers attracted by the clear Namibian sky.