The shorter unprotected Panasonic might fit.
I'll check with spacers first, as you did.
Got my UF 980L today and compared it to my Romisen RC T601 and was disappointed. Romisen is brighter AND throws further! Looking at the TF X9 now. 
After more than a year since I started my search I think I’m all settled now,
Will probably limiting my light purchase as my flashlight budget is going to almost zero( thank God there’s Overtime pay. :bigsmile: )
Took some beamshots earlier(someone ask me to take pictures of my Aspheric lens light so I include some of my other lights).
Where did you get your 980L from? I have the 980L from Manafont and it is brighter and out throws my T601. There are some fake 980L 5-mode that are being sold….