you could try putting him down a little earlier. I find with my DS2 if he is rubbing his eyes he is over tired at that point, and My DS2 doesn't really show early sleep cues. I have a rough idea of awake time that I go off rather than sleep cues.

at that age he was probably doing 2.5hr wake up time?

it is also possibly he is going through a wonder week where he is developmentally changing and is just going through a fussy period. You may find if you change nothing it will all go back to normal in a week or so.