Why not do it the easy way?
An Excel (or other spreadsheet) would seem the ideal way to account for these multiple changes.
Alternatively, as the aircraft is going in for its annual, why not just ask the engineers to re-weigh it and get an accurate new Basic Empty Weight and CofG (NB: I have no idea how much it costs to weigh a light aircraft).