Heya, after reading this thread I decided to deal with this as you have, by just trying for more 45 minute naps if he'll only take 45 minutes.
Y'know, giving up! (I prefer to call it "surrendering" because it sounds more spiritual and all.
)
Having said that, I've been stretching my son's feeds to 3.5 hours, with one four-hour stretch in the morning, and letting the naps fall where they might.
It seems to be helping the nightwakings. However, it's an absolute trial to leave the house during the day because if I'm out and he doesn't nap properly, I'll have hell to pay later. Thank the Lord for online delivery.
So maybe we just had an OT baby? Egads. Hard to know. As I said, if only I could have more than one "perfect" day a fortnight where it all happens like it's supposed to.....