PoE Malachai's Vision builds

So far ive made some decent progress in the build, its just shy of 1mil avg hit and 7mil full dps (20 stack release), and essentially maxed block (74% attack block sadly so 1% off max.) and it has 100% crit rate. The only real issue is its going to be a pain to build, not because its made of crazy expensive items, but because its an all unique item build (minus the belt), because every piece has to be corrupted for the defenses to work and it would be a massive pain to craft and risk bricking a bunch of rares. So I'm looking for any tips or advice to better optimize this build essentially.