It would be wise to stop thunders numbers at 150 planes around 2024.
The investment should be then around upgrading them to block 3 and beyond .
People won't like this ',,,,,,,
but the planes is too small in weight and engine thrust to weight ratio to be more than second tier fighter plane.
the F16 are 30% bigger in size TWR have bigger better jammers and radars and more lethal weapons.
Thunders radars and weapons can be improved but the power will never match the medium weight fighters and heavy weight fighters the thunder will have to face off against.
In contrast the F16 being 30% heavier and thirty percent better Twr can go toe to toe with the flankers and mig29.
Rafale will require different solution