So I already did some research into this from a previous comment and it doesn't look like an exact replacement for the sticks I used are available. This is a real shame. I did't expect those joystick to go out of stock when I picked them. Maybe I should put the Solid Model files for this project up so people can make mods to utilize a new style joystick.
Edit: Just checked and the STEP files are already uploaded.