Need help with 13mo naps now I am back to work

[Jellybabie3]

Hi all. DS is now 13mo. Hasnt ever been a great night sleeper but has recently been pulling off longer stretches of 5-6 hours and one recent stretch of 8pm til 5am (woo) he typically wakes every 1 hour after that first wake up though. His naps have been quite reliable. He usually has 2 x 1.15 hour naps as below

Current routine on my days home:

5-5.30am wake, comes into our bed for bf then back to sleep
8am wake for the day
10.45 am nap 1.15 hour ish
Lunch
2.45pm nap 1 hour ish
Bed 7.30 ish

At childcare he has to be up at 5.45am so waking for a feed at 5am means we are up for the day. Childminder says hes having typically still 2x 1 hour naps. Bed 7.30pm. Hes shattered and very upset by the evening though.

I personally take him swimming on a Friday which he LOVES. It starts at 11am and ends at 11.30 so typically we get up for the day earlier than the schedule i posted to squeeze in a nap before swimming else he may be tired and grumpy. i can be back home by 12.15 at a push however if he doesnt have a nap before swimming he falls asleep in the car then doesn't settle properly again when home for a full nap and it screws up the afternoon.

How do I get him enough sleep and into any sort of routine now i have his age, group and childcare to contend with.....

Suggestions please??

Most babies seem to transition to one nap a day at around this age so I wouldn't put too much energy into making a routine that works for two naps.

DD dropped to one nap a day at 12m which she generally has after lunch but if we were to do a very physical activity in the morning she might fall asleep for her nap as early as 11am if in the car, so it's flexible.

When DD is at home she'll nap for roughly 2 hours but never manages more than an hour at nursery which isn't ideal but can't be helped.

Thanks much appreciated