I visited the Apartheid Museum a few years ago when I had a short window in Johannesburg. It was very interesting, and you could combine that with a Soweto tour. With a short stopover, drink plenty of water and plan to move a bit more slowly than usual if you are sensitive to high altitude. I was surprised by the altitude factor!