In regards to the D, do not agree to anything less then what you want. It is much more difficult to change the decree once it is signed by the judge. Make the changes you want before it gets filed.
On another note, the things your wife says seems to really get under your skin. I truly understand how it can, but you can't let it. You need to detach from her and her comments.
“Do you want to be RIGHT or want to be LOVED” “You have to have a life to share a life with someone” “When you stop resisting, you start learning”