As for the hesitation, check/clean the throttle position switch. The copper contact traces on the PCB board wear away over time and may cause hesitation when cruising. For a replacement, check with SF Don…and get very friendly with him in the meantime as you will find for D-jet problems he is...