Be sure you're taking enough of the fenugreek-- your sweat should start to smell like a mix of maple syrup and gym socks, it's been a while, but I think I took it for 2 weeks, then took a week or two off, then took it for another couple of weeks. I took 3 3 times a day.
Are you using a good pump? I used a Pump In Style. If you are using a PIS I HIGHLY recomend getting the SoftFit shields and a set of the larger shields. (I do NOT know why they don't make them large AND soft!) I'd use the soft ones for a week or so, and then when my output dropped I'd use the large ones for a week or so! I also had to add pumping sessions-- for the first couple of moths I was able to keep up and even add to my freezer stash just pumping twice a day at work, eventually I was pumping twice at home too, and four times a day on my days off. I also woke him up just enough to nurse every 2 hours when I was home and awake. It just didn't make sense for him to suck down bottles while I was at work and sleep all the time when I was home!
You can also try lactation cookies here is my recipe but there are others;
http://www.recipezaar.com/Peanut-Butter-Lactation-Cookies...
Also, when he starts solids I'd give them to him while you are at work-- afterall any one can dish up the Gerber, but only you can nurse. And if he's taking all his solids/juices/water while you are at work he'll take fewer bottles!
I'm with you on loving to nurse and hating to pump! When Isaac turned 1 I threw away the pump and did a victory dance around the dumpster-- he had only had 3 ounces of formula! Now I have a nursing toddler-- you don't have to worry about milk supply becaus he's eating a lot of solids-- and you don't have to worry that he's getting enough solids because he's still nursing good-- VERY relaxing!