The rim upgrade would make it worth it to me. The hubs are probably equally as good, or at least very close. There is a big debate about straight gauge spokes vs butted, I prefer butted but have had wheels with thousands of miles on straight gauge spokes with no problems so I think the quality of the build is more important than butted or not (assuming using quality spokes)