Fruitlady - I am two years in and still don't know if I'm maintaining the 'right' way or not. I don't think there is a 'right' way.
I second what Mel said - as long as what you are doing isn't damaging to your body or making you miserable and is keeping you where you want to be then you are maintaining the right way for you. Now, it sounds like what you were doing in the past was making you miserable, so now is the time to tweak a little. Good for you for recognizing that and trying to adjust before you made yourself crazy.
I am not one of the stricter maintainers - I might have a 1300 calorie day, I might have a 2500 calorie day. I still overindulge on food sometimes, I might go light several days in the week to have a blowout weekend meal. I might have that blowout meal and then go light the week after. Like Mel, I felt at the beginning like that was cheating, but I realize now that is just who I am. I like the things I like and am not willing to give them up. I try to target 1850-1900 as my normal day. I am 5'5", 38 years old. I currently weight 129 pounds, want to be back down to 127. I had too many of the 2500 calorie days the last two months.

Now, I will tell you this - even when I am at my absolute best 125 pound mark I can get on the scale the next day and be 5 pounds heavier if I eat too much salt or sugar one day, or if I have my evening snack too late at night. I have a range and have to stick in that or the fluctuations drive me nuts. I exercise 5-6 days per week. 7 if you count my daily 20 minute yoga goal (on the 7th day I do a light 'no sweat' flow, compared to power flows the other days.) I target three days of running, three days of strength training w/ a cardio chaser on those days. And the daily yoga, which truth be told has been more like 6 days per week than 7.
If you were eating 1000 cals per day and then having 5000 cal binges on the weekends then you were probably eating around 1800-2000 on average? And now, with 1600 per day & 2 days at 2400 you are still only averaging about 1825. That could very well be your maintenance level. You aren't much shorter than I am and I maintain nicely at 1850-1900. I say give yourself another two weeks at the level where you are and see what happens. Realize that a 5 pound fluctuation isn't a gain - no one gains 5 pounds overnight - and that it is a water blip that will settle back out. Take a deep breath. You will figure it out.
And like Mel & Bright Star said, those calculators are just generalizations based on averages. Everyone is different.