One thing to add is that several of the Cadet modules you have there use the deprecated sync method. From what I understand, one can (and people do) intermix the two, but it might streamline things a bit if you avoid those.
This thread might also have some useful info for you, as you start to plan for the future:
I imagine much of the timing of that plan has been totally thrown off by C19, but it seems the general plan still holds. And always hard to tell what the development time is realistically going to be with LZX stuff, but there are some exciting things on the horizon (notably Visionary Series II).