Yeah, because Mark Hamill briefly discussed it in the Comic Con TFA panel that "[Harrison and I] were originally love rivals" and Harrison was like, "how many times am I supposed to say I'm sorry?"
So the original perception (by Mark, anyway) was this love triangle situation, which they hinted at when Han was like "do you think a Princess and a guy like me...?" to which Luke promptly shuts him down with "no." After A New Hope, it is Han and Leia as a romance all the way, with Luke pursuing his own journey in terms of finding out the source of his Jedi power and how to deal with who his father is. I thought it was beautiful how Luke/Leia and Han/Leia both wrapped up in ROTJ. No love triangle nonsense was thrust upon us, just a beautiful situation of three people who love each other.