Yes. Exactly that.
You CAN import an upgraded gun, and it WILL get through; but there's a good chance it will get seized and will have to get sent for ballistic testing and it may be many many months before it ever gets back to you. 18 months is not an unrealistic delay.
There's a reason why there are still Canadian retailers.