sounds really daft have you tried blockin the dump valve off???
my s2 did this replaced everything but in the end it was just the dumpers!!!