I'm looking to upgrade my 2008 comfort cruiser to a fitness style hybrid. My budget allows for maxing out at $500 (on the bike itself). I ride trails with the kids, charity rides, and would like to commute to work on occasion (15 miles round trip).

Ultimately the decision comes down to bike feel, but with the limited budget, am I better to put my money into upgraded components or disc brakes?