Last time I saw the post, there was no solution
By the time I did it in my car, I could not remember where I saw it
Seems similar to what you did
But I’m using terminals 7114-4021. I chose them over the ones you are showing because they have a hole for a clip on the other side of the terminal (compared to yours) and it sits much tighter in the connector
After I assembled a connector, it seems much more solid
P.S. I installed a microphone behind the steering wheel behind the cluster cover with 4x4 holes.