I'm not sure whether you can completely rule out water pump. Granted the M water pump is much better than non-M, but it can also fail. There are reports on non-M pumps that the impeller is loose so it may fail intermittently. Best bet is to take it out and inspect it.
Last edited by TonyJ; 12-17-2012 at 05:16 PM.