Surefire 8X w/X80 lamp. Anyway to convert to 60 or something useful?

I have a Surefire 8X that I've had for at least a dozen years. Went thru several rechargeable batteries, but put it away several years ago as the smaller lights with 123's were easier and better, esp with a Malkoff.

Anyway, I'm curious I've got a couple spare Malkoff M60's and a 61 inroute, and I'd like to use this 8X body for something useful.

1. Is it reasonably possible to use a P60 drop in with this light? (Say my M61) Will a P60 simply drop in?

2. Does someone make a "filler" for the body so I could use 123's? I won't use the rechargeable batteries anymore.

Any thoughts to help out a guy?

There was a post about 1.5 years ago where someone modded a 9X with an LED to accept 18650 cells. It was an extensive mod though, but a malkoff drop in may be easier since you just have to provide battery contact. Thermal cooling might be an issue though.