I see no need to replace the current rifle, or caliber.

"If what I say offends you, you should hear what I don't say."