Taking it back to your LFS will probably be the best bet mate! I think you've covered pretty much all the bases.

GL