if the bore/rifling is good then I wouldn't replace it.
As for barrels, MY opinion is i'd stick with mil spec Colt production or SW production. Maybe even go midlength.
its a slippery slope when you look at all the available options. Kid in a candy store. I have an M16 with a 7.5 inch that has...