Of course, if you don’t care about absolutely original looks, you can always run another wire for the choke out of the motor somewhere else all by itself – add a connector in-line with it if you want a quick way of disconnecting to remove the motor from the boat, then have it follow the original fat cable to the solenoid box by joining them with zip-ties.
Dave