It sounds like you're doing a great job! I think I could have very easily given up at any point between 2-5 weeks (esp at 3 weeks) but am now so happy that I stuck with it. I found using Lansioh after every feed and lots of airing helped
I also went through a dreading feeding stage... But feeds are more spaced out now and don't take as long and I'm finding myself missing the extended feeds.
Good luck - and keep in mind thats its not always easy