Thanks!
Yes, exactly. I baked material IDs from my base mesh and added some missing detail colors missing from the sculpt. Then did the rest in Painter using smart materials and masking.
I just baked my own (cleaner) normal maps and AO, not the Painter generated ones.