Looks like you have the right stuff already.

the OS is very dependable and powerfull engine.
JR digitals are hard to beat... use the S/A version or convert the current ones over to nylon gears if they have metal gears.
The nylon are smoother and will last long.

8411sa, 8417sa, 9411sa all good servo's

Wayne