I hate to ask the obvious, but why don't you just swap the shrouds and internals? No muss no fuss. You may have to lap the threads in with valve grinding compound if it doesn't want to screw on easily. Rarely, and I mean very rarely, a mauser shroud won't index, but even those are usually very easy to fit.
