Is the number of Yuan in service with PLAN still at around 17-20?
They might have added a few more after 2017. PLAN went stealth mode plus tight control on the media with regards to submarines since then. Its not like years ago when there was plenty of pictures of submarines.
From what I think is that the entire Yuan class fleet went into a refit except for the newest ones which didn't need to. The older ones, the ones with the squarish sails, were refitted with new sails that have the curved and webbed corners. From this time on, the number of pictures of the square sailed Yuans dramatically dropped, and most of the pictures you see now are the ones with the curved sails. Upgrades might also include other things within the submarine.