I do see what you mean, those would be nicer.
I got these, but maybe I'll see about exchanging them.
It does look like a similar base that you have. I've never worked with rivets, but that does sound like a better solution since I wouldn't have to deal with the plate in that cramped spot inside.
Thanks!