I have a hard time believing that the Spa gave you a 60 minutes massage rather than the 90 minutes! In my experience, the therapists know that an excellent massage equals good TIPS so I very much doubt that they pushed you out at 60 minutes when in fact you paid for 90 minutes!
Also why ask for a different room if the issue was slow housekeeping? So you wanted to move to a different housekeeper's section?
Sounds like you were looking for any items possible to pick a fight to get your points back because you felt that overpaid the points!