Got to both agree and dis-agree with CHW, and the disagreement is very slight. If you are happy with the rifle, save your money and use it as is.
Cost wise, depends on you and several factors whether or not the expense of a new barrel warrants the job. A ball park - and that is VERY rough as a guess - to have a gunsmith shorten the barrel and re-crown and replace the front sight I'm guessing at $250 or so, Maybe slightly more or less. I've dealt with Gunsmiths who ran the price ranges for custom work from 'Let's do it!' to 'I'd better change my drawers after hearing this!'.
A guestimate of a new barrel installed would be around $350. Here's that little fly in the ointment: You could buy another rifle for that. Or, depending on lots of other factors (is the rifle a private purchase with no paper trail, how badly do you want your own customized rifle, etc, etc, etc.) it may be worth it to you to chuck out the money and have it done. I just threw out an idea, and bless you whatever way you go.