Your second link demonstrates the original analysis is akin to isolated, mission critical systems. Worst case cascaded to worst case, cascaded ...

This is an important analysis for those isolated, critical systems. Not so much when we can share energy.

FWIW, if the 2013 eroi was 1.2 years, I presume 2016 was still better. My expectation of a 40 year lifespan with minimal degradation (love those SunPowers) will put my system at 30+.