The one thing that seems glaringly obvious from all this advice is that any change will be an improvement over the stock set up :-)
And all of you that have changed something have been very happy with the results.
I find that very reassuring, as it looks like I won't make a mistake and buy a poor set up which ever I choose.
Worse case scenario, if I end up not buying the best one, is it will still be big improvement by the sounds of it :-)
Also I now know I can find a way to stop the clattering for sure :-)
Thank you all,