here are a couple of possibles on craigslist phoenix.....likely to be less hassle and less overall cost than upgrading. I have worked on neighbors and relatives bikes and the BSO just don't stay adjusted....
gary fisher $120 seems under priced but don't have feel for the market
https://phoenix.craigslist.org/nph/b...873946730.html
specialiazed hard rock sport $90
https://phoenix.craigslist.org/evl/b...888946601.html
__________________
Life is too short not to ride the best bike you have, as much as you can.