I don't know how your situation got to where its at but I had no problems sending a piece of gear back for a mod. The folks who did this for me told me what to write and declare, word for word, and presto! Just a standard one day wait at the border.
You would think that if the folks you dealt with sell here, stateside, they would have known that and set it up for you.
You would think that if the folks you dealt with sell here, stateside, they would have known that and set it up for you.