Can I re-enter Thailand with both my old and new passports if I have a valid visa and re-entry permit?

Yes, you can re-enter Thailand with both your old and new passports as long as you carry the old passport that contains your valid re-entry permit. Thai immigration will check the old passport upon arrival, so it's crucial not to attempt to use the new passport to gain entry without presenting the old one.