Shimano 600s are nice. I'd say fix the wobble and stick with it. Though matching front and rear looks better, and Surly hubs are sealed bearings which means less matienence.