It's interesting because his A time is on the lower side of average - which I wouldn't expect for an LSN baby. Normally they have super long A times, and shorter naps, both. Average A for this age is 3 hr 30- 4 hr 30, so you can see what I mean

I'd start maybe by pushing that first nap a bit later, add 15 mins on to A time to start with and see how you go, stick with the new A time for three days or more to allow him time to adjust. With my two, if they had been taking a nap until 4.30 there's no way they would have gone for a 7pm BT, so I can see what's going on there. I always had to ensure that they were awake by 3.30 in order to preserve BT at 7/7.30.
At the same time, I would add that one NW isn't that bad

If everything else is going well for you, I'd be tempted to stick as is, for now, but know that it will probably need to change soon. I'd keep an eye on the nights he wakes and stays awake for longer, and see if there's any pattern from those days. NWs are often a sign that routine needs a tweak.
It's not unusual when in the 2-1 transition that the day lengthens to 13 hours or so, but looks like you're hanging onto the naps maybe a bit too tightly

and it could be time to change things a bit.