Ok, how's this instead:

Sat-9/8
Fly to Cuzco 8am
Explore, stay the night

Sun-9/9
Go on to Ollanytayambo (staying here for the night)
Travel to Uruamba and Pisac ourselves via taxi/bus (no tour!)

Mon-9/10
Train to Agua Caliente

and then the following Wed/Thurs, we'll do Chinchero, Moray, and Maras. <- Any suggestions for this? Tour or no tour?