One thing that the makers can do is
They can make Veer as Hriday and Aakesh as Naag
Aakesh a cheel in previous janam is born as a Naag and Naag Hriday is born as a cheel in this janam.
Also, The entire sequence of Jay's skin changing is so 😵 It felt he got drugged and the close ups of his face had zero expressions dissapointed