Yeah, that stage sucks - we found it really hard to get to 3.5, and then hard to get to 4 as well, because of short naps! For a while I wasn't feeding until an hour after she was up sometimes, in an effort to stretch the feed times out. Sort of helped a bit - she fed much better throughout the day when it wasn't so frequent, and I think that helped the nights.
And stretching A times helped as well, even to the extend of ignoring her tired signs for a bit because she was telling me she was tired but then doing a short UT nap! But a lot of it is just the developmental stage too. Hugs.