Which wouldn't be better, but still a bad decision by the navy. Even if, it was the Russian who decided why which yard should do it not us, since they had their own interests in this too.
Both cases are different, the Russians didn't had any benefit from re-working the ship other than getting work for the shipyard and pay the workers. FGFA on the other side is a varient of a fighter, that they are developing for them too, so they do have an interest to get us and our money into the development, once to fund parts of it, but also to secure a useful number of exports and future upgrades.
The point we need to be careful though is, that we demand as much in return for our investments as possible, which is a matter of negotiations, rather than trust. Each side obviously will try to get the best out for them, can't blame the Russians for that.
I think IAF already made that clear .Recently they severly criticse about HAL working share in FGFA with Russ.