Transitioning from EP to EBF with questions

EAMommy

Me again...

I posted last week about making the switch from EP to EBF. My intention had been to EBF all along but when he was born 7 weeks early, developmentally he wasn't ready. Now he's ready and I have a couple more questions.

He's doing great with his latch (as long as I use a nipple shield) and will feed any where from 30-70 minutes every 2-3 hours. 

I've had oversupply since day one. I have always pumped twice as much as he eats and after 5 weeks have 200+ oz in the freezer. Here's my question: How do I get my supply to match his demand? Will I forever be tied to the pump? Today we are doing a "boot camp" of sorts and only BFing in hopes of saying good-bye to the bottle. However, it doesn't look like I'll be able to say good-bye to the pump. I have already had to pump twice today as I was still very engorged after he fed and was full... Any tips for cutting down on the amount of pumping without getting clogs or infection? (I've already dealt with 2 clogged ducts about 3 weeks ago...)