OK, so, I'm realizing that the real problem is the morning A time.
Wednesday: I tried to extend his A time by 15 minutes. It usually takes 15 minutes to wind down, and when I put him in his crib, he is asleep pretty soon. So, when he woke up at 7:50am, I started wind down at 9:50 - thinking he would be asleep by 10:05/10:10. However, he cried and cried and cried, even when I was holding him,, so I thought "OK, he's OT." This was confirmed when the nap only lasted 30 minutes. The rest of the day was fine with 2h A time, afternoon nap = 1.5h and catnap = 40m.
Thursday: Decided to go back to 2h awake time in the morning to avoid OT. He woke up at 8:30 (from a 7:00p bedtime Wednesday night), and I started wind down at 10:15. He still cried (not so much), and didn't get to sleep until 10:40/10:45. This nap lasted 35m. He still took his 1.5h afternoon nap after 2h A time, but absolutely refused his catnap that evening. I put him to bed early (AT = 3h) at 7:00 (we usually go to 7:30 or

.
Today: Woke up at 6:30

Tried to get him to sleep longer, but to no avail. He was sleepy and rubbing his eyes the whole A time, so I had a difficult time figuring out when to start WD. Ended up starting at 8:20 and then he cried and cried and cried until I finally gave up and breastfed him (which I hardly ever do so it's not usually a prop) and he passed out at 9:00.
I'm confused. Should I be extending AT and cutting catnap, or is something else going on? I know he might be teething, but then again I've been thinking that for 3 weeks now, so I don't think anything is imminent. His reflux is acting up again, but I'm not sure why since we just upped his meds two weeks ago.
Since he did so well being awake for 3 hours last night before bed, should I just go with that? Should I just jump to 3 hours at some point, since inching up to it is still resulting in OT? I know he has been awake at various times for 3-4 hours (not intentionally, but he will only fall asleep at home unless he's absolutely exhausted), so maybe I could give that a go for the morning?
I'm just frustrated because he's so tired all the time, but won't sleep properly during the day. Night is somewhat better, but he did get up an extra time last night.
Thanks!