Nick - if the input filter/fuse/switch can be upgraded/redesigned then I can't see why the SMPS shouldn't be retained for the digital and control circuits.

Use the separate (and isolated) analogue linear PSU for the analogue circuits but you must be aware of the new grounding requirements, I guess you'd need a schematic frown