Em- I wish I could tell you whats wrong, but I think it might be teeth as well, Maybe just give hime a long bath, I know that helps Charlotte relax, or try and feed him to sleep.

Good luck