Update - as I mentioned earlier, I haven't had it over 3,000rpm before. So I took it up a semi-hilly area this arves and opened it up to about 4,300rpm. The noise is much quieter now, I'll keep an eye on it but for now, it seems to have fixed the problem. Who would have thought...
Hopefully...