I found the SP36 runs very hot on Turbo so if you’re not going to use on max much then the LG’s will be fine. By using 10A cells I had a reduction of 600 lumens vs the 30Q’s. My 30Q’s have a solder blob added so you’ll get less gain using button tops.
You may get more output if you use the Sanyo NCR18650GA’s instead of the LG’s since the positive end is slightly risen which acts as a button top. Less resistance without an added button top