This was a great itinerary, although an extra day in Petra would be helpful especially when you are battling heat. To have time to actually use the pool at the 'village' hotel would be incredible. We came in around 10-11pm and were out by 7 am the next morning.
Also, you really need to deal with the 'extra' activities. We came in early to do the Desert Castles add-on and were told we had to wait to talk to our tour director - who we didn't see until 6 pm that evening when it was too late. (when we asked about it before going we were told to talk to our tour director when we got there)