I find your approach interesting and will try it. Especially as I'm paying a fixed monthly.
But surely this is fragile against model changes in the future. But maybe it's still better than manual fixing.