have you changed the black fuel pressure box on the metering unit? my s1 had the exact same prob as you had fuel spark etc just wouldnt start changed that and it was spot on

worth a try