E 
I don't really post much here or anywhere, but figured I'd add my own answer which is "D". I have new challenges that I'm working on, some related to credit, some related to other parts of my finances. However my credit situation is light years improved from when I first started. I can qualify for a mortgage if I want it, but I want a down so I don't have to deal with MIP and FHA.
Also, I am no longer afraid to close credit cards which will not hook me up with a AF waiver (score be darned). I'll take the little hit in score for a couple of months while my bigger limit no-AF cards make up for that lost history (BOA World Points, Juniper B&N and Juniper I-Tunes). Will keep Hooters maybe for another year as that limit is decent and helps with total utilization.
Anyway...D is my answer... 