Sorry no safe and/or practical rechargeable options for the MN60 and MN61 in the M4, but here's the options I know about.. (copied from the chart)
----------------------------------------------------
for the M4:
Cell configuration: 2x17670
Bulb Options:
SF MN15: 9.5W, 154 - 100 lumen in 74 minutes
SF N2: 9.5W, 154 - 100 lumen in 74 minutes
SF MN16: 20W, 330 - 175 lumen in 31 minutes
SF MN20: 19W, 272 - 160 lumen in 34 minutes
LF HO-M3T: 15.5W, 273 - 172 lumen in 44 minutes
LF EO-M3T: 18.5W, 308 - 175 lumen in 35 minutes
-----------------------------------------------------
for the M3T
Cell configuration: 2x17500
Bulb Options:
SF MN15: 9.5W, 151 - 94 lumen in 52 minutes
SF N2: 9.5W, 151 - 94 lumen in 52 minutes
LF HO-M3T: 15.5W, 268 - 162 lumen in 30 minutes
------------------------------------------------------
The 17500s are limited to less bulb options because they're lower capacity also designates that they have a lower maximum safe current limit. If you have the body bored to fit 18mm cells, and use 18500s, then you can run any of the lamps listed above for the 2x17670 configuration. If you have the M4 bored, you can run 2x18650 for longer runtimes and slightly brighter output.
While the MN16 is potentially the brightest drop-in bulb for a rechargeable M4, it is also going to be the most overdriven, and have the shortest life-span of the bunch. Which is why I would lean towards suggesting the EO-M3T.
IMO run the HO-M3T and EO-M3T in the M3T and M4 respectively, this will give the best performance with good bulb reliability while still being safe. In the M4, you could step down slightly in output to the MN20 (still going to be very reasonably bright), the advantage of the MN20 being that it is not so heavily driven and will have at least 30+ hours bulb life with very low risk of premature flashes.