I think you should just forget about having the matching rims. It really doesn't matter. And if it does, you're going to pay for it.
Personally I would have they generator hub handbuilt 32/36 on (any) strong rim by a good wheelbuilder. Performance wasn't very high up in the list for the sirrus anyways, the difference between your current wheelset and any future dynohub/rim combo is negligible to say the least.