just fixed mine with simular prob was the mad unit itselt so you might find changing it will help
what unit did you change in the end mate?mine has just started chugging a little and similar probs