If you're getting better naps at 2.5hrs, then probably best to leave it as it may be that he's getting overtired. Also some babies prefer the morning nap sooner. I would just work then on pushing out his 2nd A so that he's not awake too long before bed
