absolutely think you have it right on the nose - after the last nap make it as low key as possible for a few days and see if that helps at all. as of now i would leave the bath where it is and see if the other helps - i know my lo gets excited for her bath too but still sleeps well...if the other doesn't work, maybe try bathing in the morning...