replacement faucet (and showerhead) for wet bath?

Soon, I'm going to have to replace the discontinued pull-out faucet in my 2004 22' wet bath. The sink faucet pulls out to become the showerhead. The model AS used to use appears to be discontinued, and it wasn't very good to begin with. If you've done this, what have you replaced yours with? It needs to extend, and ideally needs a toggle to stop the water flow without shutting the faucets off (when soaping up, to conserve water).

The faucet I want to replace is the "Fontana Portofino Pull Out Faucet" that used to be made by ITC.



Thanks!