I would, and do, use spring tabs like the second picture.
I do not like folded metal tabs. Battery lengths and diameters are not quite so standard as you might think, there's fairly considerable variation in my experience. More so with the modern types like Lithium-Ion cells where you have protected and unprotected and a few quite similar sizes (19670, 18650, 17670..) but also AA and AAA cells have some variance between manufacturers.
Spring tabs make it much easier to insert and remove cells which are even in the rough-ballpark of being "nominal size".
Also folded metal tabs have the tendency to catch on the, for want of a better word, wrapping around the cell, and could potentially short out pos to case.
3D printed frame for "somewhere around" 18650 cells.