Too late of a bedtime ?

So we have a bedtime routine established for our LO and it usually consists of bath, massage with lotion, jammies, bottle, and a few books before he finally goes down.

Well I feel like I may need to move the routine up about half hour or so because lately he ends up crying bloody murder right after the bath so it seems to me like maybe he’s overtired at that point.

Do you guys agree?