So I‘ve known this guy for almost 6 years. In the beginning we had a kind of relationship but then he cheated. A year later he reached out to me and apologized and we talked through everything. We kinda wanted to try it again but I was too afraid and got in a RS with another guy for 3 years (BPD logic haha). But in the meantime me and guy1 met sometimes. After my RS we also met a few times but there was nothing really big between us. Now, about a month ago he messaged me again. It has almost always been me to message first and we met 4-5 times now. He is in a RS but wants to end it (not bc of me). 
We never had such a beautiful time together. No kissing or more, just two people who know each other very well and are almost soulmate-like sitting through the night and talking about everything. 
But it is taking a turn. He often makes positive comments which are direct but confusing for me. I don’t know how to take all of this. He wants to be with me but first needs his free time after that RS. He also knows that I still love him. I really can’t distinguish if those are his real feelings towards me or if it is NPD. 
I told him last year about my BPD and yesterday he told me about his NPD w/slight sociopathic tendencies. This is a bad mix I know. But I can’t get rid of him and he feels like a drug to me. 
He changed a lot and me too. Our depressions are also much better. Maybe now we are mature enough for a good RS? 

Tl;dr BPD girl in love w/NPD guy for way too long &amp; now we’re meeting again and it is better than ever. Is it his NPD or real feelings?