Good news out of this whole scenario is that Jinnah class is going to be a new ship rather than 4 one of babur class.
So the question is what will be fait of those additional daman class ships. will Jinnah replace them or will it be in addition to 6 heavy tonnage ships planned but still not revealed ships.
The PN is working towards 20 "major surface vessels."
Our guess is that "major surface vessel" = a 2,000+ ton ship capable of anti-ship warfare, anti-sub warfare, anti-air warfare, and supporting a helicopter.
By this definition, the PN has 12 such ships in the pipeline: 4 Type 054A/P, 4 Babur-class, and 4 F-22P. You can add the 2 Yarmouk-class OPVs just to be conservative -- so 12-14 'major surface vessels.'
The remaining 6-8 ships could be Jinnah-class frigates. This would make sense because the PN is paying for the development of this ship for a reason. It wants a design tailored to its requirements and will invest a lot of money into preparing KSEW to carry out the project from scratch. So, building 6-8 of these frigates is the right call.
I think the 6 'heavy tonnage ships' were in the context of OPVs, but it's unclear. Besides, the direction of the procurement may have shifted a bit with the new CNS. The current CNS openly said that shallow-water attack (SWAT) subs are a major focus, so I'd keep an eye on that.
However, I do think the PN will still acquire additional OPVs, but not from Damen Shipyards. Rather, they could look at ASFAT's MILGEM-based OPVs. KSEW is going to get very familiar with building this design (Babur-class), so a lite variant equipped with a main gun and CIWS could be an affordable option.