Jo, do you think his sleepy cues are reliable? Maybe he is showing tired signs after 2h even though he is not tired enough to go to bed yet?
In any case, I agree with Sara that it does sound like discomfort. I think Reflux often flares up when teething, no?