It’s crystal clear that Veer is Aakesh and Jai is Hriday. Aisa koi hint nahi diya makers ne. Jai just thinks that he was meant to be all powerful instead of the Adi Naagin in this current life. Bas itni si baat hai.
Jab se that Wikipedia confusion has happened, people keep doubting every couple of weeks ki there will be a sudden role reversal between Veer and Jai. How would that even be possible? It would make zero sense to switch roles when everything is so clear in the story. This is Cheel and Naagin ki story.