I'd expect that a faulty flow switch would simply cause it to run
cold. I don't get anywhere near 5 litres out of it before it cuts
off.

Hang on, reading again, do you mean the water stops completely? The tap is
dry?

If so, you may have some sort of airlock. Did this start happening when you
installed the new tap?

Christian.