Modifying Yezl S5

Has anyone modded a Yezl S5 XPG-R5? I keep having flickering issues with the driver on high so the question was; Fix it or mod it? I really like the heft and feel of this light and want to keep it in EDC rotation.

Well the answer is obvious, so I am planning on stuffing an XM-L into it. Maybe see if I can find a TIR that will fit too.

Does anyone have any experience modding this light? (or the Trustfire F22 which seems to be identical) Always appreciate some BTDT advice.