I think you know the answer, which is yes, do rebuild them. There are subtleties to wheel building and a learning curve. The rims will last longer and the wheels stay truer if built properly. It goes a lot faster the second time. One way to speed the work is to take one wheel down completely, tape the freed rim to the other rim and move the spokes over one by one. Be sure you put them in the right orientation. Also make sure the stem is placed between two
parallel spokes and not between two crossed spokes. A look at the wheel
will show what I mean.