Now there's around fixing/replacing the diverter.

Simply leave the faucet diverter open and install a spout with a diverter built into it