Yes, you are on the right road.
You said it best when you said: I have determined not to do more for him than he wants to do for his self
That statement is likely the golden rule for dealing with addicted personalities.
As for the self-pittying comments, yes - that is baiting. He is trying to engage you, trying to manipulate and trying to create drama. The best response is no response.
I believe some wise soul here at SR described it this way:
It is as if the individual is setting a filled suitcase of their baggage at your feet. Now you must choose how to respond to this baggage being put at your feet. The healthy choice is to step around the other person's baggage and let them find their own solution.