Actually we should not wait go for J10 bs/ FC20 with AESA about 36 and should replace two squadrons of Mirage -IIIs for strike roles as early as possible to maintain capable strike factor of PAF. Mean while go for producing more JF-17 block2s and even block 3s as early as possible befor induction of J31.
Pakistan may get them at earliest like they did in case of F7Pgs.
However only Chinese Jet for which we will have to wait is J16 for naval role. Pak sholuld not go for any other version as it shall be capable naval strike fighter and may give tough time to 5th generation fighters in future. Considering how much Pakistan has dragged Mirage 5s for naval role. Further J16 shall be more maneuverable and difficult to tackle even by latest air defenses also having advantages of semi stealth and long range with high altitude ceiling.