My HPDI starts and runs great with a good holeshot, runs at top end good. When I put it in neutral it idles up from about 10 to 18 on my Yamaha guage an the exhaust boils the water bad. Also my lights on my Ranger keypad flicker with the rpms of the motor. Had a TPS sensor and a shift switch put on last week with no fix to the problem I found out today. Any suggestions. Guessing electrical issue maybe.