NDDT - I'm glad to hear that you are re-thinking the R talk. I think you could probably just not bring it up again...and she most likely will not either. OR...you could discuss your D and how best to handle all of this, etc. Just working out the logistical details. I think that could actually show a lot of independence from you - whih would be a good thing. I would stay clear of Retrovaille too. She's simply not ready for that - in my opinion.
In my opinion, what you need to do right now is pretty simple. Enjoy your D, get your place and your life where you want it, do not contact W unless you really need to and be the happy guy you want to be when you do have contact with her.
That is what is in your control right now NDDT. The rest is up to her to figure out.