Your issue with the idle increasing isn't an issue. It is the purpose of a choke, that is the way it is supposed to work.
When you start it you pump the pedal once. Closes the choke and sets the car to high idle, as the car warms up the idle picks up, once it's warmed up and reving fast a quick blip of the throttle should drop it to idle.
When you start it you pump the pedal once. Closes the choke and sets the car to high idle, as the car warms up the idle picks up, once it's warmed up and reving fast a quick blip of the throttle should drop it to idle.