Help adapt my build

From my Reddit post:

http://www.pathofexile.com/passive-skill-tree/AAAAAgQBhO8b-gzywQT7CZAKeA3uDl4THRRXDagYpBlaGusU3Q1hIcAaah7SIU4qmSsFLSkuFy9DMfcyTDXyL7cxGjJqOxo-Xz-2QY9GUUdUSWBLZU2QVYBWcU1RYAthQ2PPZXlo42r5Yxpsh3ZPfUd-vYEZhcOGGYpwfRqP55G-iqmVSn1mnmeggKQppXKprKrxrFuvJLAkqpu1rK98uAW1876Nv53EKMVVxhvIpcv8xZHOPs_Q0IbR-tLo1prP97722hrbAdzz3SXfq8WE2b3mROc26XzZdO0c5yLqWfNY9XrvVvri6rvt

That's what my planned tree looked like pre-1.2. My build is a max block Facebreaker/BoR/Aegis Frenzy Duelist. Auras are Discipline, Hatred, Grace (I'm going to have to switch % aura efectiveness in Sovereignty wheel to -reserve). I only took a quick glance at the new tree and came up with:

https://poebuilder.com/character/AAAAAgQAmSu9gWVNFFJHfoTZJd8b-qQZEuFhIeLqAdxeE4TvrK_nkcOGKaVOKrZBQzEbyKcwAec26GSjGlUYkVBHFCApLvGsfLhfP8EEVbWezVcN0iF82XKp9zK77ZHOrKqQVcAaWfPjajbp-tJmnho4p4R-4oBWT31RYKmVjM_2SD38WGNKfYd2Z6D8xd0NW6-QCloaveb5Y6OK7g5W-qXLDPLC7AW1jb9RRz7Pz3qyGTIBmybo1usUpDnQgUfiIuIVICzp7w4nL-OfhxlsFvxLJ-3Xy7fTPeKdxFj1tzFDY5rPcU0WbySq

It's probably not efficient, but I didn't have enough time because of school.
Any help?

*Was the 12% block -> Spell block node taken out?* Yes it was :( 😢😢

https://poebuilder.com/character/AAAAAgQAmSu9gWVNFFJHfoTZJd8b-qQZEuFhIeLqAdxeE4TvrK_nkcOGKaVOKrZBQzEbyKcwAec26GSjGlUYkVBHFCApLvGsfLhfP8EEVbWezVcN0iF82XKpkc6sqpBVwBpZ8-NqNun60maefuKAVk99UWCplUp9h3ZnoPzF3Q1br5AKWhq95vljo4ruDlb6pcsM8sLsBbXvDicv45-HGWwW_Esn7dfLt9M94p3EWPW3MUNjms9xTXTteu9gSwUtFy9k54CkVdbo1usUGo_22vsJGYqbtSLqWGM9_IzP9kj3MrvtPs9RR42_

New Shadowstart and its generic phys dmg. nodes aught to be attractive? There are also a few 20% melee generic nodes nearby?!
You have a solid + 30% block from passives. putting you at 64%. The last 11% are right by your path and should be powerfull, if your can afford it.

https://poebuilder.com/character/AAAAAgYAaoz1b8gUotmw2Ba_Go_22vsJGYqbtVM1D6vrFOjWIuqly21sBbVeRZLz-uuNv_ljFfC95j3it9PXy6OKTZIj9kp9h3ZnoPzFVvruDpAK3Q1brymlTiqsr-eRw4ZeExvIQzG2QWEhhO9fP8EEVbWezSku8ax8uCcv458FLWBLeu907VcN0iF82XKp9zK77ZHOwBpZ86yqkFUXL_rSZp5V1mTngKTjajbpUWBPfYBWfuKplVhjPfyMz_ZIncRY9bcxQ2Oaz3FNeWgLYXgNvooB3KQZG_ol34TZ4uqHGWwW_Esn7Voa

Dang. I was really hoping my build would work on my Duelist, but Shadow is superior in almost every way. I lost 30% Life, but that's insignificant. Pre-1.2 my build had 154% on the Duelist. The Duelist tree now has 154% which equates to around 210% pre-1.2. The point is that my build always had a low % of HP.

Shadow has double the Physical Damage and more %res and %EV and gets Attack Speed for the same number of points.

That's disappointing.

After reading the patch notes, Shadow is the only way to go.
RIP Duelist.