I was in the same situation when I moved to OK (minus the run-in), and I was told up and down the chain in Oklahoma that "if you have an Oklahoma address, you must have an Oklahoma permit". OK will honor the out of state permit if you have the out of state address, an in-state permit if you have an in-state address, but not mix cases.