What times his nap? I’d bring the nap earlier and cut it to 1 hour/1 hour 15 mins and then bedtime at 7pm still, my little girl used to do this but now she wakes at 7am, naps at 11am-12 and then goes to bed at 6:30 and sleeps through unless she’s ill x
Cut down the 2 hour nap and try half 7 instead of 7 xx