We ran into the same situation last quarter. What worked for us was starting small and only adding complexity when a real need showed up.

Solid breakdown. The only thing I would add is to back up before making the change — better safe than sorry.