I would do the same thing, keep the better pieces, and change everything else... U need way more crit thats for sure. First time I made my barb, i had 35M budget. Went up with something 70k dps, 53% crit, 700+all res and 40k hp with 1700 loh and 5% LS. I did not browse for bid or w.e I made buyout and thats it.
Avoid Legendaries most of time cuz they are too expensive for what you get from em