The CC-M is a drop-in replacement for this locomotive, you just add one wire to bring the serial data over to the CC-M.
The Super-Chuffer II is what you need for chuffing smoke and smoke at idle. In addition, it will support Rule-17 lighting and automatic cab light control. If you want 4-chuffs/rev, the Chuff-Generator will also be required. However, if you're happy with the existing chuff switch, you can stick with that.
For these steamers, I also usually recommend a "tune-up" of the smoke unit, new wick, and replace the 27 ohm resistor with a 20 ohm 2W wirewound resistor.