Just as a conclusion to this, the shower started acting weird again the other day, but permanently this time. Turns out the fill valve in the cold water tank was only giving a trickle, and the shower was often sucking on air, so replaced that.
That gave a slight improvement, but the pump was...