Jonathon, is there any chance of spacing the cell a bit further apart on the S2?
I realise you are limited by the size of the tub but I noticed when I saw some pics of the car that the cells are extremely close together.
Personally, I'd be willing to sacrifice a tiny bit of performance to gain some peace of mind with regards to cells shorting out
