Thanks for the support jessmum46. We've been keeping with the 2 hour awake times as much as we're able. Sometimes he's really tired at an hour and 45 min and sometimes we can push it more to 2 hours and 15... just seems to depend on the day.
So- how I've been handling all of his night wakings has been to feed him. If it's been less than 3 hours, I try patting him back down, but if it's over 3 that just seems to really tick him off. It's hard to know if he's actually hungry or not though.

He will start off eating well, but then almost taper off because he's just exhausted. I try keeping him awake from letting my hair fall on his face, to rubbing his cheek, and switching sides often. We're usually up for 20-30 min before I just lay him back down and go back to bed too.
MJ&N - So he's doing about a 3.5-4 hour routine throughout the day now pretty consistently and the naps are lasting anywhere from 1.5-2 hours. When you dropped that afternoon feed, did you just have him wake up but not feed him so he went from Sleep to Activity back to Sleep?