Noise From Analog Section

I recently bought a JD-XA and I am having issues with noise from the analog oscillators. If I play an analog waveform from any analog oscillator or part I can hear some pretty bad noise coming from the analog section. This is most noticeable when the filter is set to Low Pass and has a low cut off point - although the filter does effect the noise to suggest the noise is pre-filter. The noise also gets louder if I add the second A-OSC with the same or different waveform. I have created a Soundcloud playlist below displaying the issue. I have also read reports online of this issue which I fear is the same as what I am experiencing.

https://soundcloud.com/matthewfoster/sets/roland-jd-xa-noise-issues

This also happens when a digital waveform is passed through the analog filter. I can also hear some low level noise when the analog filter is fully open and all the MIXER sources are turned off.

Also worryingly I am getting some random clicks when using the digital side.

So to summarise.

1. Excessive noise from the analog oscillators which is effected by the analog filter
2. Random digital clicks when using the digital side

Both of these i have read reports in online forums (including here)

I really like the keyboard, and I would be very happy if these issues could be resolved...