I'd go ahead and upgrade if you want to, yes it might cost you almost as much as getting a new bike with similar level of componentry but you'll get a bike that has exactly what you want on it. Brake wise - I strongly recommend SRAM 9 V's with Avid levers.
Richard
__________________
Currently riding an MTB with a split personality - commuting, touring, riding for the sake of riding, on or off road :)