Grace first is the right starting point. Repeated baptism can’t make Jesus love someone more, and that truth helps quiet the fear that coming back to faith has to be earned through another ceremony.
The distinction you drew between a second baptism and reaffirmation matters too. Talking with a pastor helped me see how reaffirmation could publicly mark repentance and renewed faith (more on that here).