Thanks! After all that, I finally clicked the "restore default OOB" again and this time it appears that everything is back to the way it should be (i.e. no more "future" weapons and the Japanese and Chinese OOBs appear to have the updates I was looking for
Not sure what happened but I'm happy