Check with some Hajj & Umrah agents and see what they have to say on this. Yes, you are right that all bookings must be made much in advance due to the rush during Ramadhan.