I disagree on swapping the bonuses... it's not clearcut to me which is better, although the 5 base damage probably gets the nod, depends on your build.
The bonuses don't need to be progressive anyway, just need to be enough to make it worth equipping those last two pieces even if you have to drop some nice gear to do it - or enough to make those who just want the full set feel good about themselves
