Warrior/Knight Rekindled Warrior Build Upgrade

I'm a level 105 warrior who's been using the following build for a while, but with skill point IDs being removed from Tomes in the Rekindled Update (which this build relies on for the five extra Intelligence points in order to use the Diamond Hydro Necklace), I want to update the build.

WynnBuilder build:
> Cumulonimbus
> Hetusol
> Greaves of the Veneer
> Pro Tempore
> Facile
> Intensity
> Remikas' Authority
> Diamond Hydro Necklace
> Convergence [f6f6f6]

Total HP:
15710.00
Effective HP:
46958.40
Effective HP (no agi):
35264.08
HP Regen (Total):
951.60
Effective HP Regen:
2844.41
Earth Def (Total):
120.00
Thunder Def (Total):
-57.60
Water Def (Total):
437.25
Fire Def (Total):
400.00
Air Def (Total):
306.90
Strength:
30
Dexterity:
40
Intelligence:
107
Defense:
91
Agility:
40
Mana Regen:
55/5s
Mana Steal:
-8/3s
Life Steal:
215/3s
➜ Effective LS: 643/3s
Reflection:
15%
Walk Speed Bonus:
39%
Sprint Regen Bonus:
56%
Soul Point Regen:
20%

Is there an easy replacement for the necklace or leggings that does not compromise mana regen or defense, or should I redo the build altogether? Are there builds similar to the stats on this build but with better mana regen stats?

 

This is a good build. I've used something similar recently that has slight more mana and more EHP and still does similar damage: Convergence | Uppersurf

I like Tenuto as a necklace option giving access to your powder special and a little extra sustain through Lifesteal. I have also thought about using Dawnbreak in a build like this for even better sustain: Dawnbreak Version