1990 mercury 150 xr4. i just changed water pump assy, engine was overheating at idle and cold while running. i just bought and will be changing both t-stats and poppet assy. i was wondering if there's anything else i should look at to fix this. i think the t-stat or poppet is the problem. thanks. at idle, water pressure jumps from 3psi-10psi and while running at 5000rpms it holds at 25psi then jumps to 30psi and back to 25psi. temp gauge while running is pegged on cold, idle thru an idle zone and it warms up too much.