Woodland---it sounds like you are taking good measures. Remember, that it is a process and time takes time. Co-dependency traits are given to relapse---as they can be our defense mechanisms against our pain.
A favorite saying of mine-----"Just when things seem to be going well---Here comes Co-dependency, wearing a smile and a Sunday Dress."