I dont know if I have the "answer" for you, but I am in a similar situation that has gotten better. My son (now 3.5 mths) was doing the same thing so I started giving him baths in the morning or early afternoon as he was getting tooooo stimulated. Our bedtime routine consists of a diaper change, story or two laying on the floor, white noise, swaddle, lights dim, and bottle. I dont think you have to have a bath as part of your routine. Tweak Tracy's ideas to fit your baby.
Gage can only be up a max of 1 hr, so I have to give him a nap in the evening. As a result, he goes to bed between 8-9pm and gets up between 9-10am. If I try to keep him up then it is all over! He will not go to sleep for hours as he is overtired. It sounds like your lo is overtired. Try a longer wind down without the bath and a prompt bedtime. Maybe that will help.
Also, I have been having a hard time teaching my son the difference between a nap and bedtime. i have been doing a different routine for each so that he can distiguish the difference. He still wakes up and hour later, but has been going back to sleep after a feed.
HTH