Personally, the bath is a big seduction scene if you are there and I don't think she is ready for all of that. Keep the bath as a relaxing time for her only. I like your first idea (setting up the bubble bath that night. Have it ready. Then take her there tell her to enjoy, give her a kiss and tell her I will see her in the morning. Then I will leave and let her enjoy the solitude, and maybe some thoughts about us). You said she is stressed with her school stuff, etc. This would be nice...relax, sleep in the next day, maybe get some reading done and then you come the next day for some "couple time".
