get the short tap and weld it to a long 1/4" or 3/8" ratchet extension and use a socket wrench to tap it out. I had to do that for something simular. Make sure its a good weld so it doesnt break loose in the block. Cheap and easy fix.