I use bootlace ferrules where ever possible (they are commonly used in
the industry here). Would also try and use screw terminal blocks with
built-in leaves that protect the screw head from the wire. Much
better, especially if you want to redo the connection a few times.

I would never try and terminate soldered wires in a screw terminal
block (it just isn't good practice).