As a FvS main, I hate to say this, but the simple fix to all of this is making the DoT not stack. It doesn't make much sense that it stacked in the first place.