Good to hear from you, hope you are all hanging on OK.
I would let the AM nap go up to 2 hours if I were you.
PM naps can be very tricky to get at this age! I always had to AP ( buggy, carrier, carseat) the 2nd nap when DD was transitioning. Do any of those options work for you?
Yes, a new routine will take a while to settle in, I would give it 3-5 days to see how it goes.
I think your response to the 6-6:30 waking is quite appropriate. If he is out at 7 then that is 11-11.5 hours of sleep so it may be that he has slept "just enough" and perhaps working towards shifting to a later BT is in order? Just quite gradually as he can handle the longer A times. Hope this helps, keep us posted!