[Weldangrind]

You might have to get creative with the cap, but yeah, you could switch to a tub spigot diverter. Just be sure about what type and length is on there now, so you don't have any fitment issues. It will most likely spin onto 1/2" male NPT or slip onto 1/2" copper pipe with a setscrew; I hope it's the former. If necessary, you could easily sweat a 1/2" male nipple onto the pipe to change to the spin-on type.

If you choose to change the spigot, make sure that all of the operators know to run the water to temperature, shut it off, gently pull the diverter and then turn the water back on. I've probably changed more than 50 spigots where the knob has been pulled right out, because it's acting against the full volume and pressure of the fill spout. Mind you, I work with 3/4" stuff that has higher pressure, but still.