Guild Wars 2

Hey all, been playing WvW for around 3 months now, currently I’m using D/D and Staff.
My build is 20/10/10/10/20 and I use P/V/T armor with sup runes of the earth.
For accessories I use all Berserker’s gear.

I rarely die and can deal a kitten load of damage atm, been thinking about more survivability for when I get a Commanders tag.

I’ve been thinking about taking 10 out of Fire and swapping it to Water, losing the +5damage Fire trait and picking up cleansing wave in the Water line.
Also changing my Berserker’s trinkets to P/V/T also, I know the trait point swaps would give me an extra 1k ish health, what kind of gains would the P/V/T accessories give me though? everything Exotic of course.
Also would these changes totally gimp my damage output?