Nina is a month younger, but we are going through something very similar. She was waking every 2 hours for a feed also, and I'd feed her back to sleep. My dr recommended trying to re-settle her without a feed and only feeding every 3-4 hourly.
If she wakes 2 hours after the last feed, I try re-settling her while in the cot, if that doesn't work, I'll pick her up and give her a cuddle, and she almost always go to sleep then. I give it about 10 minutes and if nothing else works, then I feed her.
My dr told me to do controlled crying with her, but she's only 5 months old and DH and I don't want to use that parenting method, so we'd prefer to rock, pat or feed to sleep.
My dr did say doing these things will create bad habits, but I'm not prepared to do otherwise.
I reckon do what you feel is best for you and bub.