that would do it....
the "tick over revs not dropping cleanly" sounds like the stepper motor.
the 'standard' kludge is to pull the top end of the hose #4 below (it goes to the airbox)... and stick a bolt into the now open hose.
[You must be registered and logged in to see this image.]you can do a few other things, but you'll likely end up doing this.
if you live in a cold country (brrrr UK) then you may have to use a throttle lock or similar on those frosty mornings as this disables the 'auto choke'. I survived through 2 Tassie winters (Hi Tev!!) and never had an issue with cold -one particular morning was -5º C, the entire time.
Mind you, my Sport is the ditch pump A2 variety......