LOL - sounds like my life at the moment too - I was supposed to be living in Egypt but I'm in Tasmania instead.
EgyptAir is pretty good to fly with, and often they have cheap business class flights as well - which can be well worth grabbing just for the extra baggage allowance.
You should be landing at T3, and most likely also departing from there for a Hurghada flight as almost all EgyptAir flights - both International and Domestic use T3. Occasionally a domestic flight will use T2 - its about a five minute walk - you just have to weave your way through the usual riffraff offering you a cheap hotel, a camel ride around their uncle's mosque etc.
Will be pretty warmish in July, but diving conditions should be pretty good.
When travelling to Egypt they are pretty paranoid about drones, sonar units etc at the moment so think carefully about what you are packing, other than that you will be fine.