Options to Repair 93150 Clasp?

[wamcneil]

Hi All,
I have a Submariner with late 90's 93150 band that I'm getting worried about. The safety lever pin and transition piece are getting pretty worn (see photo attached).
It looks like the safety lever pin is bent and also worn. I can also see that the transition piece is worn thin. I'm not interested in buying a brand new band...
What are my options here?
--I've found a thread that talks about replacing the safety lever pin with a 'rivet pin'. But no specifics. This seems like a good option, I'm concerned about how the clasp would play with it.
--93150 Replacement clasps are available used, but I'm concerned that a used clasps may be worn in this area also.
--Can it be replaced with a 93250 clasp? Seems to me this design has a much better transition link, but any issues with this lego swap?
--Safety Lever replacement p/n "32-20732". Are these a viable alternative through ADs or other watch shop?
What else?
Thanks!