Get a new 31.8mm Thomson - can't go wrong with one of those.