What if you pushed his nap til 2pm, and woke him at 3:15 or 3:30? At 2.5, I could see that my dd just wasn't tired for her normal 1:00 nap......I moved it a little later, shortened it a bit, and we're ok for now!
Today she woke at 8, went to nap at 2:15, and I will wake her now, at 3:45. She'll go to bed around 9. Kind of a late bedtime, but we have much more pleasant evenings this way!