Congrats on the purchase!
I think AT makes a diverter.
Sounds like you need an adjustment to the cable or a new one?
Depending on the spacing, you can unbolt the universal joing connecting the motor and pump. Its not hard, but can be a little time consuming, a jet away is a nice fix for being able to disconnect(or atleast allow the motor to run without turning the jet, but its pricey)
In my experience the pertronix ignitors work very well.