Parts are here and installed and should work great.

A big thanks to Wendell at Outback Gun Parts for having what I needed to fix it.