Hi Chelsea,
Really, I've been there and I know EXACTLY what you are going through. Changing the feeding to sleep is not easy because like I said, they REALLY REALLY want to feed to sleep.
So what did I do to keep him awake?
I talk to him loudly while feeding, sing to him while feeding, get DH to come in the room and talk (because DS will always stop and listen if DH is talking), tickle him, tickle or stroke his feed etc etc. No, not pleasant really but I just had to stop letting him fall asleep.
The other thing I have done gradually is to introduce story time between feed and bed - so now we do bath, into jammies, into bedroom, feed, books, bed. Just one extra step to MAKE SURE he is not asleep going into the cot. And as I said earlier, it is A LOT of hard work but it has paid off. It is SO IMPORTANT to pick your plan and be consistent.
And remember - if you feed to sleep once in a while, your LO will know that he can hold you out until you feed him to sleep "just this once" (yes - I made that mistake a couple of times) so once you stop feeding to sleep you have to keep him awake during that feed EVERY night. If you let him fall back like I did, you really will make things harder for yourself.
Chelsea, I know it is hard but those night wakings are so much harder. You can do it - it will be short term hard work for long term gain. GOOD LUCK and let us know how you are getting on.
Cheers
Jo