Dave, in that case the very first thing I'd try would be the ferrite ring. You can just hairpin the esc-to-radio lead and stick it thru the ferrite as many times as it will go, five is about right. This is supposed to suck the glitchiness out of the wires, and I guess it works, a lot of folks use it.
Second, I'd try relocating the esc. Servos are a distant third but still a possibility.

bart, you will need a gyro if you ditch the 3-in-1, and I recommend a heavier esc, like the GWS ics300li, you won't need the heatsink on that one, nor fuse either. Since we already know the motor can draw 2 amps when stalled, I would go with the bigger unit for the margin of safety (some would call it overkill).

I am going to say the EFlite swash is the better of the two that I own. The MH swash has too much play in the main bearing and isn't as stoutly built as the EFlite one. I am going to put the eflite one on the blingy thingie and swap the MH one back to the stocker.

And I just got the SuperSkids as you know, but I did not like the little wire tail braces, they seemed really bogus, so I made some nice ones from 2mm CF rod and some Align link sockets, and attached them to the heli by installing some of the aluminum link balls that I took off my MX400Pro when I replaced them with the Align ss ones.
See: