So far all he has given is words. If he can't give actions, I wouldn't expect this time around to be different than before. I wouldn't be to quick with the D. You can visit that later if desired.
Lay it on the line for him. (which I think you've done) Be for warned however, that it is very common for the WAS to oscillate between you and the OP. Wanting the former, but not wanting to let go of the other until they know things are on solid footing.
Piecing is not easy. It will test you. Follow your heart, but don't ignore your mind.