The hotel spa sounds like a good idea. You can have your bags stored and automatically brought up to your room when it's ready too!
Try getting a facial too before or after your massage if you need extra time. They usually take about 45-50mins. Also, does that spa have a lounge area and showers too? If it does you can always relax in the lounge area and as long as you don't snore

you should be fine