So happy it seems to be working! Hope tonight goes well.
Have to agree that baths are amazing as part of the bedtime routine. My LO tends to wind up rather than down when he's getting tired and the end of the day will often see him running around like crazy - a lovely warm bath always calms him down and relaxes him and takes that overtired edge off him.
I also always give him plenty of warning about what's to come and talk about what we're going to do. So, after dinner I say, "It's almost time for your bath and to go to bed", then when he's in the bath I say, "After this we're going to go in your bedroom, get your PJs on and then it's time for bed", etc. Even down to, "When we finish this book we're going to turn the light out and you'll get in bed and go to sleep". Might be something to try with Thomas if you haven't yet!