I happen to agree with you especially since a big part of Will's arc seems to be about growth and confronting resolving old issues. As familiar as Angie is, she really is an anchor to the past, a constant access to a drug that just doesn't do what it could once be counted on for. I've been in this situation and had to let go of destructive people, places, and things. Old ideas! Will may need some more focused alone time and some relationship practice. Angie and the Doctor are a good fit...