I kind of doubt that REI is going to be able to help you. You have CBTD (compulsive bike tinkerers disease). Buying a complete new bike will only give you an additional bike on which to swap components, so it will actually make the matter worse. There's no known cure so you might as well just go along and enjoy it.

Don't ask how I came to become an expert on recognizing the symptoms of CBTD.