Sorry to hear about all the troubles you have run into. Unless you want to make a complicated event more so I would find a FFL on this end and let him deal with it. Yes money will be spent but time and ever increasing aggravation might be avoided. Sometime you spend so much time and energy getting one of these things done that by the end it is just too much. I understand how mad it can make you when you are mislead. Importation is a long and involved process in these days of so much anti gun hysteria. It might be tempting to get a C&R but I might pass on that. Let me explain why.
I had a C&R and had an unexpected complication on the local level. My local LEO had to "sign off" as required and felt that that gave him the right and duty to inspect my guns and storage place on a regular basis. He made clear that he did not feel that these types of C&R are wise and that constant monitoring should be done to make sure that they were not abused. I know that I could have probably stopped or limited him with a decent lawyer but did not for see what a pain this would grow into. He became a pain in the butt with yearly inspections of an unannounced nature. When I felt that my buying days were about over, and we all hit this point at sometime, I got rid of my C&R.
When he next came around and wanted to inspect my guns I refused. Told him to get a warrant that I no longer had a C&R. Nasty little bugger raised a stink and was finally told by his boss to drop all attempts to bother me again for what was a bogus inspection right. His boss, the mayor is my next door neighbor. Problem is that by the time it all ended there were several dozen extra people who knew all about my guns and who knows how many others might learn about them in the future. One of the best protections against theft is staying below the horizon and this jerk broadcast my name and location to many others, "just doing his job".
He also had the local fire department check to see how much powder I had on hand since he learned that I reloaded shells during one of his "inspections". Seems there are state and local laws limiting how much powder you can have at your home. Much to my relief I was just about out of powder and passed with empty shelves. Had I failed I was informed that my fire insurance would have been null and void by state law. If I had a too much on hand I would have been cited requiring a fine be paid. Loaded ammo was OK just "loose" powder was restricted. If less than a dozen at the fire department learned about my reloading and guns I would be amazed.
We are both on each others s-list and his options to bug me are a little better than mine. To say that I drive under the speed limit in town at all times is no joke. So that C&R that made buying guns so easy came with a unforeseen side effect. If you are in a anti gun area or have a LEO who is a jerk, power hungry or just likes to throw his weight around you might be better off staying below the horizon and not fooling with a C&R. If I had it to do all over again I would not do it again. I rather pay the money and stay low.
Your problems will be resolved in time and you will have a gun that cost less than if bought from any dealer in the US. It cost them almost as much to import as you are paying and then they have to mark the gun up to make a profit. So that 21K purchase might have been more in the 27.5-30K+ price range. When looked at from that perspective you are still getting a decent deal.