Hmm, where to start? What was the width of the old BB, and what is the width of the new one? Because new or old, if it's too wide, you'll never have a good chainline.
As for the brakes, lesson learned. That's one of the reasons I don't let anyone else touch my bike. He shouldn't have messed with your front brake, unless you signed something when you dropped it off authorizing them to fix whatever was broken. At least he didn't charge you for screwing things up.
The cost to fix your hydraulics is more than I paid for a new set of BB7 mechanicals, with discs and all hardware. If you want low maintenance, that's where I would look. By the way, $47 seems step. Check with Alex @ MTBTandems.com for custom length Goodrich hoses. I bet he's competitive in pricing. I had a local industrial hose supply company make me a custom braided stainless hose with fittings, plus pressure testing, for about $60. The bike I run that on is a bit heavier and faster than your MTB, so I know they will do the job on a bicycle.
Let us know what you decide.