Similar situation for me later this month too, I've allowed 5 hours for connections each way at JNB with the hope that Comair will move me to an earlier flight if we are not delayed. Interesting to see that there may be a possibility of checking bags through on the return, that would save a fair bit of hassle.