Thanks for the input, I am leaning towards those servos even if I have to grind a little off the gear to fit them in. 180* should be fine, as I am pretty sure the JR ones are the same.

The Y is an MPI used for older Airtronics servos, which were 4.8V only at that time.I picked it up at a swap meet in Toledo and since I had to go through and replace all the connectors to make it work, he just gave it to me.