Fantastic suggestion!
I just got back from Jordan in March and it was spectacular in every way. One thing-- very far afield here-- -don't- do one of the trips that has you get to Petra late in the day for a few hours-- either see Petra first thing in the morning or skip it this time-- seriously. Late in the day it's completely overrun and awful. But overall Jordan is one of the safest, cleanest and most beautiful places I've ever been.

Also -barely- on-topic, one cool option is that QR flies right into Luxor from DOH (no transfer at CAI)-- if that ever comes up for some reason..
Was in Luxor in Feb of this year and, as stated above, it's -well- worth a few days if you can swing it (I was there for a week and was sorry to leave.) Stay at the Sonesta without a doubt. And, also try and hit sites first thing in the morning (and try and get to Abydos!)