First of all, remember that your very first dua at seeing the Ka'aba is accepted so walk with your gaze downwards till you're close enough to see it right in front of you.
If you're in a hurry to get over tawaf quicker, best time to start is right after Zohr. Crowd is less so you're done in twenty minutes despite walking in the outer most orbit.
For staying at Makkah AND Madina, I would recommend Intercontinental as it is right in front of both, the Ka'aba and Masjid e Nabvi. Others are also closeby and less expensive though.
For inter city travels, never ask your booking agent to tailor plan for you because while taxis charge SR 60-70 between Makkah and Jeddah for example, we were charged SR 400 for a round trip including the driver's wait. Fuel consumed is less that SR 30 so no way must you agree to more money.
Pray well and pray for Pakistan - corruption, lawlessness, joblessness, favourtism, end to many industries and the politicians to say the least. Drink lots of Aab e Zam Zam and remember that supplication while drinking is listened to. And if you remember, pray that I go back soon too.
Good luck, thanks and congratulations in advance from Vajih102.