The housing probably isn't flat, either the thermostate housing or the water pump housing. Bring them to your machinist and ask them to correct it.

Now I need to pin those needles, got to feel that heat
Hear my motor screamin while I'm tearin up the street