I would recommend Griffin & Howe. They were part of A&F for many years, and their gunsmiths would be familiar with the A&F imported guns I would think. They will not be inexpensive or quick, but they will do it right.