I'd do a modified version of Trip 2. If you're doing it on points, Tambo Del Inka is great. If you're paying out of pocket, Ollantaytambo has a lot more to offer. My significant other and I stayed at Hotel Sol in a Private Room with Balcony overlooking the ruins for ~$50 USD/night. I'd highly recommend it.

For Cuzco we stayed at Hotel Encantada, Room 302 again has a private balcony, with incredible views of the city. The one challenge here though is the hotel is at the top of a rather large hill which makes it a workout to walk to.

I'd scratch the Pisac market, I wasn't overly impressed.

Sunday

Arrive 1300
Private driver/guide picks us up from airport and takes us to:
Ollantaytambo town & ruins
Check out the ruins on the opposite side too
Night at Hotel Sol in Olly


Monday
Private driver/guide
Maras salt pools/terraces
Moray
Chinceros
Night at Hotel Sol in Olly

Tuesday

Depart early for Machu Picchu
Night in Aguas Calientes (Inkaterra Machu Picchu Pueblo)

Wednesday

Wake early (0500) for sun rise at 0744
Depart on 1055 for Ollantaytambo, arriving 1232
Private driver/guide picks us and takes us back to Cusco, arrive approx 1430, go around the following after dropping off bags:
Sacsahuaman (Cusco)
Plaza de Armas & Cathedral Santo Domingo - Briefly (Cusco)
Qorikancha (Cusco)
Night in Cusco (Casa Cartagena, JW Marriott or Palacio Del Inka)

Thursday

Cusco Airport 0900