i had this problem, replace both switches, and the pump, then realised there was a loose spade connector... still flickers at idle once warm, but think this is because of a slightly low idle...
check the connectors... then replace the sensors. but if u can find anywhere thats willing to do it, have it pressure tested, that will put your mind at rest.
rob