you could put 35mm in that and then donate your Xpan to jox's junk box...
I'm guessing Miles Whiteheads name may crop up a few times in this thread
Yep Miles Whitehead would be my choice
http://www.mwcamerarepairs.co.uk/
If you email him and explain what you want, he'll be quick to reply with a quote
Miles sorted out my M7ii last year. Fast and very good value too.