There are going to be arguments, normal as can be..
You're dealing with a guy who appears to living out two lifestyles, unsure of what he wants in the COMMITTMENT end of things.. You seem to know what you want, he doesn't, so, UNTIL HE FIGURES IT OUT, don't GIVE any more than you are GETTING, and pull back just a bit as you suggest.. When you continually GIVE to someone who is UNCERTAIN about what you are GIVING, STOP GIVING so much. As you've seen time and time again in your sitch, when things take on friction and you LET GO, a little, things seem to get better.
Go dark, back to the basics, you know the routine. I'd probably begin contemplating what it is that you EXPECT out of him rather than trying to live up to his expectations all the time. It appears to be pretty one sided as of late...NOT GOOD..
Go out and have fun, stay busy, turn up the HALO CONFIDENCE a notch and let him come to you...AGAIN..