@loaffette The only board that I know of where FM guarantees the cell types is the GT-S. So, I would recommend going with someone who advertises the cells anyway, so you know exactly what kind of battery you have.
@puzz360 If you do open it again take a pic of the driver area. Might be worth checking the physical state if the inductors near the connectors on the reverse side.