I forgot to mention, the idle surge issue seems to be because of the TPS idle switch in the Q45 TB.

Also something to note on the Q45 TB, that the built-in idle switch will actually invert when adjusted too far one way.
So it is possible for the switch to be grounded while the throttle is open, and become ungrounded when the plate is closed.

Stock.