Hi there
I suppose it depends if it's the short A time or the stimulating bath that are pushing BT late.
It maybe well work out for you to cap the pm nap at 1.5hrs to ensure a good A time to bed and enough time to fit in your evening routine.
If it was me I'd prob try tweaking a few other things first and let him continue with the naps as they are because the night sounds good so it looks like his sleep needs are being met in a balanced way (good days, good nights iyswim).
I can see that fitting in solids and milk is tricky though and the bath is late which could be quite stimulating just before bed. (Tracy said in her Toddler book, which starts at around the 8 month mark, that a bath before bed can be too stimulating but I know a lot of people, including me, stick with the bath just before bed)
My LO used to wake at 5pm and be in bed asleep at 6.45-7pm (usually 6.45), a VERY short last A time!
He had a larger meal at lunch so the last solids meal was quite light, helping to maintain the final milk of the day. Our evening looked like this:
5pm wake up
5.15 solids, light meal
5.45 evening bed time routine begins with one calm kids TV show
6.05 teeth, bath, dressed for bed
6.35 milk (ideally teeth brushing should be after milk though)
6.45 sleep
You might consider tweaking the evening routine to get it all in before BT gets late, or moving bath to between solids and milk? It was all a strictly timed thing in our house to get through the evening routine before bed.
Just ideas