Yeah, such a pain - should have done it all when I replaced the head a few years ago. Have a buddy at West Marine who is going to hopefully give me discount on the whole pump assembly so I don't have to remove the whole head, but if that does not work - new head it is!
Also was toying with this, but would prefer to stay class legal (no class racing here, but for the next owner):
