Payal ... very well analysed and written.
In the first episode after the revamp thats how Damu described her life partner to be as you said. He didnt have to be a prince or rich.
She was describing Satyas nature which are obviously there in Veer.
Even if RK loved Savitri before the revamp it was because she was Damyanti. But it was obsessive and possessive. He wanted her but what angered him the most was Savitri always chose Veer and fell in love with him. If there was more time or the CVs had brought it out earlier it could have been a great story, RK wanting Veer out of the way. And i guess he's going to do the same in the last epi. Without Veer, Damyanti would kill herself again.