Oversupply "monsters" can be tough to tame. Often coping with oversupply is a process in which you take two steps forward and then one step back. I think that LLLMeg gave excellent advice about not going right to block feeding. Since you have been pumping so much milk, I think that you may need to occasionally use the pump to relieve discomfort. I'm not talking about emptying the breast, but rather about pumping (or better yet, hand expressing- it's supposedly less stimulating to supply) a couple oz to restore comfort.
Lastly, please don't kick yourself over the pumpng you've done. It was done with the absolute best intentions, and we all applaud you for wanting to make so certain that breastfeeding would work out this time around!