also try looking at the alternator. I have a similar problem with my S2. I think when the one way diode goes in the back of the alternator it charges the battery under load but dissapates the load when it is standing, worth trying for a £40 alternator.

Also try getting a voltmeter so you can work out if you are charging properly.