Actually, INS Vishal will probably only enter service in the early 2030s.
(subscription required -- a copy of the article can be found here: )
If they really want INS Vishal to enter service by 2025 then tbh they should have begun module fabrication by now, which of course would require having finalized a design with subsystems settled -- but at this point they do not seem to have even settled on a clear set of requirements let alone a design.
And INS Vikrant will probably only enter service in the early 2020s.
So IN by 2030s will probably fit what you described quite accurately in your post for them for 2025 -- but what will the Chinese Navy look like by the 2030s?
Assuming both navies built their carriers as parts of balanced task forces expected to undergo frequent deployments and experience high utilization rates, as oppose to prestige harbor queens, then In the long run, it would probably be the rate at which each navy can build a complete carrier escort screen with reserves, plus a matching underway replenishment capacity, that will be the bottleneck in how fast each can effectively add new carriers to their fleets. I think china has demonstrated the ability to build a new carrier screen every 3-4 years. This suggests she could add 2.5 carriers per decade to her fleet for some time.