I'm bringing this dead thread back to the top just for anyone who may do a search on the same subject in the future. I ended up taking Matt Monson's advice and took the car to Foreign Car Services in Kalamazoo, MI.
import auto repair, Foreign Car Services Portage, MI Home
As soon as Claudio (the owner) started asking me all the right questions, I knew right away he was knowledgable about MFI.
I just picked the car up two weeks ago, and it runs again like it did when it was brand new. I could not be happier with the work they did, and am also pleased that they were very careful with my car.
It rolled 44,000 miles on the odometer on the ride home - it took so long to get that last thousand miles put on, I had to pull over and take a photo!