Josh: I had great luck with the little Facet pumps on a 356 and 2 912's.
http://www.jcwhitney.com/productnoitem.jhtml?CATID=35749
Quiet, small, cheap, etc. As for the block-off, I think some of the "hot VW" catalog/shops sell a block-off that might fit. Or just leave it in (in case......)
Good luck,
Bill.