Just an update:

The door panel clips I linked above are working perfectly. Definitely recommend them.