A new wheelset would likely make a much bigger difference in your riding than a better drivetrain. Shimano XT hubs/Rhynolites are probably a good choice for general riding, although the XT rear hub tends to break down after a while. I personally have not had problems with my 3-year old XT hubs.