We get more too Sara! Also 12hr nights & 2-2.5hr naps but admittedly not the grumpy post nap waking. Could he have a bit of a bug brewing? Things like tonsilitis can present similarly to teething (cranky, fussy, chewing fingers & drooling a lot, temperature etc)