Thanks Guys,
a 1000uF cap across the supply almost eliminates the noise
That's a bit big, but I'm sure I'll find a combination that works well.