Johannesburg safari: since time is tight, investigate the options at the Pilanesberg reserve, easily drivable from Johannesburg. You can self-drive or join a group or hire your own ranger.
http://www.pilanesbergnationalpark.o...s/game-drives/
Cape Town: so many good options, your only problem is rationing time.