I would use a real BMS for this, it would be pretty easy to design with this low cell count, the common ground and
about 17V max. voltage.
You can build it with some analog muxes, a differential amplifier a good voltage reference
and a µc with a good ADC.
For balancing the upper 3 cells you can use some PMosfets with level shifters, the lower ones can be done with
a directly from the µc driven NMosFet. But carefully chose the parts, especially those that are directly wired
to the cells, with small cells the standby/leakage currents are important. And don't leave the lamp uncharged
for month on the shelve.
It can be done with standard parts that are easy to get and with a small µc you have most flexibility in balancing,
SOC, SOH and charger control algorithms.
If you double that circuit, without the balancing part, and redundant charge/discharge switch you have a
second protection and a whole redundant system.
But there are enough second protection chips for 4 cells in series available, as you don't have the need
to change the limits for over- and under voltage, that approach would be simpler and cheaper.
I'm currently modifying some similar, but scalable circuit for use in a system that goes down to 3000m.
It looks somewhat like your solution 2, but it is a matrix with more cells per pack and more packs in parallel
and series. Each pack has it own switch.
If it is important for you to have light even in case one of the cells fails, I would use solution 2
and would keep one line of cells in spare to switch over to this line (with a warning LED flashing) when
line 1 and 2 are empty or fail in another way.
In any case, I never would use larger Lithium cells without independent second protection.