So is he STTN? To be honest, although your routine isn't "text book" if it works I would stick to it!! What you can try doing is capping his morning nap, first at 45 mins, then 30 mins, and trying for a longer PM nap. So something like:
A 6.30am
S 10-10.45
S 1.30-3.30
Something like that?