I would just change out the bypass valve/ stepper motor, the symptoms you describe are classic symptoms. The last one I bought was only about £20 ,


1999 Morgan Plus 8. 3.9 ....
1961 Alvis TD21 Series1 3 Litre Auto....