Just want to make sure I have my numbers right

Mediocrates55

So I tracked on MFP in 2012 and lost 35 pounds, but fell off the wagon and gained back 15 over the past year. This is round two for me, but I want to make sure I do it right this time instead of starving myself at 1200 like I did before and setting myself up for failure and unsustainability. I've been studying the links people have posted and I *think* I pinned my numbers down, but I want to make certain. First, the stats:

Sex: female
Age: 29 years old
Weight: 155
Height: 5'4
Wrist: 6 inches
Waist: 34.5 inches
Hip: 42 inches
Forearm: 9.5 inches
Thigh: 23.5 inches
Calf: 14 inches
LBM: 113 pounds
42 pounds of fat
BF%: 26.8%

calculated at sedentary lifestyle, exercise 3x week
Checked on Fat to Fit, Scooby's, IIFYM calculators

I got my RMR/BMR at around 1537, 1494, and 1481 so average that out to about 1500.
My TDEE was at 2036, 1945, and 2056 so average that to be about 2000.

So according to IIFYM, I should pursue around 1590 for an "aggressive" weight loss (20%)
205g carbs, 113.2 protein, 396 fat, 31-39 fiber

Am I right so far?
And do I eat exercise, or a portion of it, back or is that my final number?
I really want to do it right this time and not do any more damage to myself.
O wise and mighty MFP'ers, I appeal to thee for assistance! :-)