I would replace the EHA valve. On mine the case was leaking and I simply replaced it with a new one. From what I've read, new o-rings will rarely fix them. Most of the time it is the actual case that is leaking. A replacement may very well fix your issues but you could have other underlying issues causing them too.

__________________
1989 300CE