I was thinking that using the same hubs with different rims would be best. I was just not sure if that was a option.

The guy who I usually get my wheels done from he said it was giving him alot of trouble to true up, now that I think of it...
Maybe it was done mad the first time.