Marc
We have done Machu Pichu twice using Lindblad/National geographic tours. They use top notch hotels and guides with some extras not found on the usual tour though the lectures were interesting not enough to chose them.They do overnight at the Sanctuary at the site. They work to try to avoid altitude sickness by staying in Cusco a short time and overnighting there at the end. We had a very interesting group of well traveled people. So if Ngaire doesn't have enough this is another way to go.