It's very easy to handle this: just ignore everything that happened between the two sunderings, as though they never happened. The "mess" is entirely WotC's doing, and was done deliberately by people WotC brought in with 4e who openly and publicly bragged about hating the FR setting and wanting to "reset" it. So the setting being a mess is not the setting's fault. The setting was awesome prior to the first sundering.
