Well, if I had not had my bath for the day/night and was still not able to have it even after 1.5 hours of work, I would have been very upset and insisted that they either switch my room or open up the adjacent or opposite room (if empty) so that I could have my shower before I went to bed.
Now that you haven't done that, and instead went to bed... well, I think I would negotiate to have the 15-20K points, equivalent to a night in the suite and tell him you don't need the massage, lunch, laundry etc. I'm presuming you paid for the suite and it's not an upgrade/SNA? So it would be fair to recover the cost of the suite.
Anway, that's what I'd do. Get back the cost of the suite in points, and forget everything else. Where they put you in after that isn't important: they had to move you because your room isn't functioning. It being an upgraded room is besides the point.
My opinion