If you find you still can't sleep......... loosen the screws, pull the trim back a few mm, and inject some windshield sealing mastic into the gap. Pull the trim back against the pillar to allow the mastic to settle in place, then retighten the screws (not too tight or the trim may dimple)...
Sleep well and move on. The rivets/screws hold the side trims, not the glass. I've seen a few 100s operating quite well minus the side trims entirely (with the rivet holes filled).
Screws are not the best solution, but AFAIK Toyota only make the one size plastic coated rivet. So once these...