Yes, you did well. A few tactical errors prior, but your overall strategy is dead on considering you are dealing with a 21 year old WAW and no kids.

Stay the course.