For the engine, somebody already posted this link some time ago at some thread which i don't remember:
One of the many companies present at the Dubai Air Show is Pakistan Aeronautical Complex (or PAC), which has a stand where they displayed, among several product
www.aviacionline.com
it says:
"When asked if the JF-17 Block III will be powered by the new and more powerful Russian RD-93MA engine (modernized version of the RD-93 that equips the current Thunder) or the Chinese Guizhou WS-13, the answer was… neither.
PAC confirmed that for now there are no plans to change the propulsion plant of the JF-17, which will use the same model as the previous Thunder blocks."
may be why ordered 30 planes, which also lead us to 2023-24 (
probably a time for engine availability) when we may see new engine equipped planes coming in from number 31 onward after completion of current batch?