I prefer the straight flash tubes, better for macro (faster firing time). For this compact model, 18650 might be ok too but 4xAA is really not bad. The S2000 were so perfect for compact set ups and macro, I am glad Inon will make a successor.
I dont think the LED need to be stronger. The focus light of the flash is never aiming where I want anyways.