Sounds similar. I get a big drop right after TOM then moderate loss the next 10 days or so. After that it starts to go downhill and I get bloated despite my best efforts. For at least a week before my period, I don't lose and sometimes see an increase. Rinse and repeat.
Since I understand this process/cycle, I just roll with it and look forward to my scale at the end of my period. You may consider not weighing during this time if you find it particularly bothersome.
235: Pre-Pregnancy Weight
227: 10% Lost
214: 15% Lost
191: No longer "Obese"