Looks like TurboTax acknowledged the issue and offered a similar fix to what you proposed!
https://ttlc.intuit.com/community/asset-depreciation/help/how-do-i-fix-my-rental-properties-and-roya...
