I have a friend of mine that has a machine shop in King George that does work on his own rifles, His number is 540-273 7159 ask for Kirk, He should be able to help you.
I have had my Virginia permit for thirteen years and I carry daily, But I go through Georgia once and a while so I needed the Utah permit because Virginia doesn't have reciprocity with Georgia, I took the class with James Reynolds at ProactiveShooters, It was a very good class not boring at all...