While i understand that you want to change justice, and keep sunwuko, i do not think that the devs are at any point going to totaly rework the new set.
They have a filosofi of how they want it, i think the best we can do now is to try and get them to optimize it.
With the two handers, i was not just thinking of diabos, but all two handers in the game.
But again that was just an idea of how to make 2 handers better.
Devs could also just make a set that gives more damage if you are using a twohander.
I dont know, if any one has a better idea it would be nice to hear them😊