Hi Rich,
Thanks for the reply. Yes I have costed the upgrade and there is not doubt that bang for buck a total package is better. The LBS prices in labour for rebuilding the bike which is fair enough. Things like forks for example a way more expenisive of the rack than as part of a package. But yes this is an option. I like your term 'leap of faith' because I think that describes it accurately.
cheers,