You could also swap up to the gen 4 setup. And I'm not sure I would necessarily call the gen 3 unit "weak". I think the bigger problem people had with them was the locking unit itself. I think it tended to lock and unlock a little more inconsistently or something like that, so it wouldn't put the power down as effectively. The gen 3 setup used the actual diff fluid for the clutches, so that could have a big impact on performance depending on oil quality. I believe the gen 4 unit uses a sealed fluid reservoir with a dedicated shear fluid inside for the clutches, so it's a little more consistent.
That being said, I've never heard a bad thing about the Wavetrack, so that's definitely an excellent choice as well. I can't recall, but is that one a torsion style? I think those tend to be one of the best kind of torque splitting setups you can get.