go for a more modern siemens injector then? Altho from what I gather tuners have started getting greys to fuel better recently off boost also. Speak to your tuner in that respect.
On the rebuild front I'd do the lot in one go mate, have the head rebuilt new guides etc and then freshen the bottom end up...its all done then so no worries