OP; Suggest just adding a more regular clean and lube schedule to your chain and gearing and you would seem to be all set with the bike and wheels you have now. A minimal cost upgrade to achieve a bike that fits you well and rides reliably!

My point being made is that plunging into a major kit-bash exercise on a bike is not always going to result in a much better bike... but it will always cost you a good bit of cash to get there anyway.