Finally got the new clip in the mail today, it's a yellow variant but at visual inspection doesn't look any different than my original blue one.
Popped it in and the trim seems snug and secure! (I didn't test tug the clip too
hard because I didn't want it to pop-out) I'm hoping the old blue clip was being too brittle before I broke it and lead to the trim popping out.
Anyways, I'm hoping this holds up, otherwise I might have to fallback to the welder glue/clamp. Drive test tomorrow! I'll post back if it pops out again.
Thanks for everyone's help.