Second build is much better, Retreat, Smashing blow/shrine are important I think.

As suggested replace the RW and JD, probably by dragon's tooth and spectral saber.
Also Jasmine is very good with...