M.B.
Hi J.,
I've been there. Just stay with it and put him to be earlier if you need. My experience has been that my daughter, who is almost four, has moved in and out of these phases since around the same age. A friend gave me this advice long ago and it's worked out well. Now, she'll have a nap or quiet time for an hour and she knows it.
Good luck!
M.