I think nap needs pushing (sorry to go on....).....at his age we were pushing towards a 1/1.30pm nap from a 6.30/7am WU, with some shorter naps on nursery days. I think probably he doesn't have enough A in a decent chunk in the day to make him tired enough to settle well for bed. If you don't like moving nap too much you could wake earlier in morning? But I think probably 5h pre and post nap isn't quite right now. We had more like 6-6.5 before and shorter afterwards, 4-4.5h