I agree with post #28 if you are able to use a longer continuous strips and remove some plastic away if needed.
In the second pic cells marked 1,2,3 & 3 if you want to you could link cell 1 with one long strip and will aslo triangulate that last cell to discharge more evenly.
On 2 & 3 you can reduce the welds by one by having a continuous strip reducing stack height and possible bad welds.
Whilst working to prevent mishaps cover the cells you are not working on with a cardboard template and a bit of tape , cut up old cereal packs might help prevent accidental shorting if you drop misplace a piece of nickel. Also sometimes you can't help but may be lay your wrist /lower arm across the top, it will stop the buzz/tingling you will receive from bridging the cell ends.