Very similar over here! It’s actually super normal for this age to wake up more and wake up early.. we’re going thru it too! Almost this exact schedule lol
I don’t cap his naps but because he gets super angry at me. It also makes him overtired at the end of the day and he wakes more than usual, so I stopped. Sometimes he will take a 4 hours nap and still sleeps great at night. When we did try though, I’d cap at 2h
Was having a similar problem with my baby boy. He would take short naps during the day but once the evening hit he would want to take a 2-4hr nap. I set a schedule in my notes with alarms and followed it for maybe a week. Just to get him adjusted to to times. Me and his dad went to bed late and so did he. He picked up on the routine eventually(this was at about 3m). Hes now 5m . He’s asleep by 10(schedule is off an hour give or take depending how our day goes). At 5am he wakes up for a bottle(not really awake just constant moving and I’ll feed but he never opens his eyes). He’s goes back to sleep until 8 the earliest 10:30th latest. I don’t let him nap more than 2 hours after 4pm. If he goes down for a nap at 1:00 , he can sleep until 4 but after 4 only 30min naps max