Short answer is no. It will fit the us issue metal mug. If I were you I would stick with the cleaning routine and see how you get on. There's always orange powder to take away the taste!
OR- keep buying sets of mugs and bottles until you are satisfied!!!!!
I have settled with the surplus Dutch army bottle and mug. It is a slightly smaller combo than the others and fits better into a lot of slimmer pouches.
Sorry for opening the can of worms!
Mmmmm - worms... Now there's a good source of protein...
I've tried one cleaning method but might give the steradent route a go if that fails. I'm not sure I can be bothered to keep on trying a range of options; getting used to the slightly odd (unpleasant!) taste might be the easiest option!