Lolpigs, I don't think you quite appreciate just how well you're doing! I reckon you could feed more often - 2 hourly would be quite normal at this age - and see those comp feeds disappear...
They do get fussier and want to feed more from time to time. It's ok, happens to all of us and doesn't necessarily mean you don't have enough milk.