Joburg doesn't have much to offer. We spent one night there mostly catching up on sleep and went to an open air handi-craft market but that was it.
I've heard nice things about the Falls but never been myself.
By the way, I approve of your choice of lodges in Botswana. ^