I replaced my TE610 with a pump from Fuel Performance.

Cost R1500 plus shipping.
Their service was great, as we thought the new pump was faulty and they even sent another as replacement (which we returned, as it wasn't the cause of the problem).
Anyways, the pumps are great and simple replacement.