Funny you should mention it, my family stayed at Rumi Punku (pre-covid) and had a good stay.

I stayed one night at Inkaterra Machu Picchu Pueblo (Aguas Calientes) and it was great (activities, dinner included), but it's expensive. A friend stayed a few months ago at Jaya Machu Picchu (Aguas Calientes) and it also went well. I think it can be a good idea to stay at Aguas Calientes to go to MP early in the morning.