What should I do when he wakes should I leave him until he proper cries?
I would.
I do think he might be getting used to being on his tummy. I'd probably give it a few days to see if it improves and if not, we can look at routine again and see if he needs an A time increase.