I think you're right; part of it is teething. His top teeth are coming in; one finally broke through so I think it's extra sore.
He's also finally starting to not always need a bottle to go to sleep, which is good, but it means he's not in a deep sleep when we put him down and I think he's trying to get used to that.
I really do need him to nap because I've got a phone interview for a job today that I need to prepare for and I need to pack all of us up for our drive to DH's IL's tomorrow--it's a 12-hour drive and we're staying a week and I do all the packing.
Fortunately Baby Orajel works well. It's the all-natural one, which is made of clove oil, so he smells like a ham after I give it to him.