Simplified a few elements in the hope it will
a,take less time
b, bake better.
Plus it should feel like it is designed this way rather than thrown together. I am also thinking maybe a bone handle rather than Amber is it would read better and be less complex from a construction and shader perspective.