Yeah I think you're right. The various attempts to take him down legally have always strengthened him and that's continuing with stuff like the Colorado "insurrectionist" lawsuit to get him taken off the ballot.
He uses it to his advantage constantly, for instance he's just joked that if Haley was a serious contender, she'd be investigated as much as he is. January 6 wasn't either a farcical spectacle or a half serious attempt at a coup—it was both.
Unfortunately the DNC doesn't seem to care that they need to actually mobilise people. If all they've got is court cases and holding their nerve, they'll lose.
As for what might happen if Trump wins again, it's probably a worse time for it than 2016. It would change the balance of world affairs. I have a hunch Netanyahu's current brinkmanship in Gaza, systematic slaughter and displacement along with this unvarnished rejection of the usual pantomime peace process of a two state solution, and insisting the IDF will have indefinite "full security control", is tied to a theory the US will be pulling back further.