When you run forceImport, ensure you pass in the contract factory of the current implementation contract, not the one that you are upgrading to.
After it is imported, there is no need to run forceImport again.
Then you can run upgradeProxy with the contract factory of the NEW implementation that you are upgrading to.
If you still encounter the issue, please provide the information listed in Required information when requesting support for Upgrades Plugins