Wow. You did a lot in one day. When I was there in 2003, there were no wooden steps. It was really exciting coming down. Your tip to the guide was about right. I only paid in US dollars.
I recommend an elephant ride in Angkor Thom. The Hindu temples (Rolus group I think) are nice, but farther away. Just walking around Angkor Wat on your own is good as well.
Wish I were there.
Looking back now it was almost magical despite the large numbers of people and you are right about the one guide I hired. I did elephant rides years ago in Thailand and once is enough. I'm not sure if it is even PC anymore
The museum in town is pretty cool too. I am thinking of returning as there are so many sights and things to do. Yesterday I did Tonie Sap lake on a boat I chartered from a local and I got the full experience of the floating village, floating market and going thru the mangroves on a rowboat and ended at a crocodile farm.