the reason the fuel lines dont fit, is on the S1 the fuel accumalator is by the tank, and on the S2 in the engine bay.

Have u checked the AFR and then tried adjsuting the fuel pressure? You are going to HAVE to do this with the new stuff fitted, and it could well not be needed.