Tbh your routine looks pretty good and the nights not bad at all, i wouldnt change anything so if u wake him after 2 hours continue doing so. I suspect he might need an increase of A time at some point, but whilst everything works i would just leave it as it is.