Thanks for the replies.
We've decided not to risk it and gone for an overnight layover in JNB before catching the new 8am departure the next day. There were no overnights available on our return day (23rd Aug) but I’ve set up an alarm on baredemptionfinder.com should one emerge.