Overnight Trails near Jhb

With Suikerbosrand huts being closed I am looking for hiking trails in the 20km to 30km range with overnight accomodation, either a hut on the hike or camping facilities or a loop trail with accomodation in the central camp.

We did Klipkraal in the Heidelberg region 2 weeks ago, which was a little flat, but ok, but are looking for other suggestions within an hour to a maximum 2 hours from johannesburg.

Any suggestions?