Honestly, i can't belienve that those points weren't negociated already. IAF, DAssault etc. Aren't stupid.
This is not something you can negotiate, since there is no room to allow such negotiation in the first place. The Indian bureacracy doesn't follow logic and common sense, it just follows rule of law, and the law for long term procurement sucks. Any change in configuration and designation requires a new contract. The "Configuration Control Document" cannot change throughout the contract.
One other important clause is all updates during the contract have to come in free of cost.
The problem is long term projects suffer for it, especially when even 'well-planned' projects go haywire. For example, MKI production of 140 jets was suppposed to finish in 2014, but got dragged all the way to 2020 because HAL was incompetent (more like some vendors were incompetent). The same with the T-90s, still being inducted today with technology used 20 years ago, like the Catherine TI.
That's why if F4.2 Rafales are chose for MMRCA 2.0 and production goes on until 2040, then IAF will be inducting 4.2 even in 2040, even if France has released an F6 by then. Unless you provide the upgrades free of cost.
Like how the Israelis provided the AESA radar upgrade for our Jaguars free of cost, but I guess it worked out since the contract was between ELTA and HAL, not GoI, and was direct import. But in license production, since the stuff has to be made under ToT, the actual transfer will become difficult due to slower technology absorption, even if France provides everything for free, thereby delaying the program. So free updates are possible in a direct import situation, not in license production situation, like MMRCA.
In simple words, license production for long term projects are a complete failure in India. If we actually bought all 200+ Rafales in just 6 years, at 40-50 jets a year like the Chinese normally do, then it would make sense, but we are too poor to afford that many jets every year.
This is why I personally prefer tranche purchases for long term projects, with emphasis on new negotiations for every tranche, thereby allowing room to introduce new configurations as they come in. And I think the Rafale GTG has some room to introduce a more advanced configuration in the process, since Parrikar also had the same thought, as does Rawat, but I'm not so sure about it, since they are just individuals with little control over bureaucracy. (Recall that GTG did not have options. This gives some hope that a new deal will have to be initiated.) The American FMS is kickass in that respect.
And I don't think any Rafale contract to be signed in 2021 will cover F4.2, since it doesn't make sense for the IAF to go for it in terms of both logistics and training, and the fact that it hasn't been flight tested yet. I am sceptical about a contract in 2021 anyway, since some other projects are more critical and will get higher priority. Maybe 2021 will see the beginning of negotiations for the next batch of Rafales.