I liked Ace Wheelworks when I was living in Cambridge. Good luck getting everything sorted out!
I already embarrassed myself in there once but I did like the shop, so perhaps I'll try again! Hopefully it will be a different guy this time :) Thanks!
56 Fairmont Ave has an awesome bike workshop in the basement. Free beer and food while we work too!