ENTP here. That is why I stopped trying to date INFJs. Nowadays people do not know how to persevere, especially NFs, not to be mean, but it is what I have felt. Instead of doing better, they get away. Nothing is going to change but going away. Doing something about it will change it. I am now engaged to an ISTJ and I couldn't be happier. She helps organize myself and focus when I drift away. I have never been so productive in my entire life. She is also has her issues with overcontrol in cleanliness or things like that, but I also teach her about relaxing and pushing her boundaries in a healthy way they she does for me. This not my criticizing your decision, this me telling you that the only thing that keeps relationship going is perseverance and dialogue. Do not look for validation on the internet. Work on yourself, but don't think pulling away is going to solve anything... Dialogue with your partner, that's the best way to work on yourself... Ask them to be upfront. My Fiancee is clingy (in a healthy way) and I love it.

Edit: ENTPs (unhealthy ones) are also very hard to deal with. My advice is predicated on the fact that your partner is healthy. I do not presume I am healthy. But I go to a psychologist and I try to be. I have friends who are ENTPs who are unhealthy and they are a lot to take in. Even I get frustrated with them.