You can also get some G13 lampholders with screw terminals instead of the push in connectors.
Leviton 390-1W is a common style that some smaller mom and shop type hardware stores sometimes still stock.
I usually just use the same trick as you to reuse the push in lampholders but sometimes they loosen after repeated removals. You can bend the tab back from the back but it dosen't always work.