SPOILERS FOR TAVI'S ROUTE
I kind of hope we get another Tavi route at some point that either lets us prevent her from getting broken, or lets us restore her to exactly as she was before getting broken. I enjoyed being her sub, and as it is now, even if you make her dominant again, she's not the same as she was and she still considers you her owner.