Where do you live? Sometimes there can be excellent local service that will spare you the expense and risk of shipping. Here in Boulder there's a guy who can do this stuff in his sleep (although he told me after rebuilding my 2105 that he's done with the bigger ones. Too heavy). He made my 2105 and MC30s sound spectacular and for not too much bread.

You might also see if you can talk Brad Sarno into looking at your amp.