i had similar issues at idle on my 200 HPDI in idle in the water.. at higher RPMs no problems, but idle was doom..I changed the Tstats (which were BAD shame on me) and did the water pump (motor only had one season on water pump) and the water pump plate had a slight groove in it, barely...