It can't be a crazy bad problem to be honest, I'd also be swapping it over to S30 so the present valve and the valve injector would not interest me at all.
With S30 the troubleshooting is a lot easier as you can fill with water while testing and you don't waste a whole shot of gas each test.