Hey there hun, can I pitch in ?
Well, I agree with Chicane that it's quite common for lo(s) to wake for a night feed at this age, in fact, ds kept waking for a night feed till he was 9+ months!
So, having a look @ your routine, I'd suggest sticking with a 3hrs feeding routine, since you're usually on a +/- route, and we'd need to get the 3 hrs established before moving on. So, if he has a feed at 08.00, then you'd follow on at 11,2, 5 and 07.30.
Have you considered extending A times at all, how long are your naps?
Also, what do you do with the swing when he's fussy?