Hello and welcome to BW forums

Sorry you didn't get a reply sooner. I'm going to get your thread moved over to Toddler sleep as you Lo is older than 1yo.
A set nap time is good at this age, rather than varying the time he naps based on A times (of 6 or 7hrs as you said), so if you haven't already switched to a set nap time I would suggest doing that right away. Just choose a time you think is about right based on what he was doing before his morning WU went so early and then because he is early waking shift that time by say 15-30 min later which should allow for the change he has had in sleep needs, that will discourage the EW. If the "set" nap time doesn't work out to be in the right place then you can shift it again in a week or so after seeing how he has settled into it.
Same with BT, I would shift it about 30 min later than you are usually doing it and "set" it there (set times can change based on how LO responds to the routine and what the problems are but they don't change daily).
Once you have those 2 set times in place you may see the WU time shifting later.
You might need to shift the "set" times of nap and BT later again to work with his new later WU time.
Once things settle down a bit it will be easier to see if his nap length needs to be reduced to help him have a longer night. Sometimes reducing the nap by 15 mins can add another 30-60 mins to the night sleep, although it depends on the individual. This would mean starting nap at the same time but capping it and possibly bringing BT earlier to add the sleep onto the night - but I'd hold off on this until you have shifted and set the nap and BTs otherwise you have lots of different things going on at once.
hope this helps