Hang in there It sounds like you're doing everything you can.
I went through the whole roller coaster ride of the fenugreek, extra pumping, etc. because I believed my supply was low. It has taken me this long (my lo is 9wks) to finally stop fretting and trust my body and my baby and he's thriving
Part of my problem was that I sort of used the formula as a crutch. Like if he was fussing, I felt horrible and assumed that he must be hungry so I would give him a bottle. Plus, he hadn't gained much weight at first. But I decided to just ditch the formula and give bfing exclusively a try. Even if that meant leaving him at the breast for an hour, even after he had just nursed 30 minutes before. It has been trying at times but we've made it, and I have a feeling you're going to do fine. You are very determined and you're working very hard. It does get easier! Hang in there!