I’m sure you found a solution to this problem by now but I was reading through the post and came across an article that described using thread repair inserts to removed broken bolts. I have also found some really useful information in my vehicle’s repair manual.