Hi Mel! Welcome to the boards!
Lets see...it sounds as though you hit the nail on the head...he's a little overtired. Up to about 2 months most babies can only stay awake about an hour max. That means feed, diaper change, maybe a little play time, then back to sleep. Follow your lo's sleepy signs at this point, don't worry about the clock.
In answer to your other question, yes, sometimes wake time ends up being AEAS. That's normal for 40 min naps or less. Just make sure you keep him up no longer than 1-1hr. 15 mins or so. Again, follow his lead sleep wise. Once you see that first yawn, assuming it's not right after he wakes from a nap, get him ready for sleep again with your wind down routine. He should be taking 3 naps a day, 1 2 hr. morning, 1 2 hour afternoon, and one catnap, however, some babies only sleep 45 mins at a shot, and take more than 3 naps a day for awhile. If he's always been like this, maybe you have one of them
If shh/pat is too stimulating, just try one or the other. You can also do the wake to sleep method for naps...go in about 5 mins before he usually wakes, put a hand on his back, and just keep it there. If he wakes fully, use whatever soothing method works best.
Keep your head up, you're doing great!!!
*HUGS*
Sonya =P