Ok, I knew the 20mm Khatods would fit after some grinding, but I didn't know whether they would provide the flood I'm looking for. Now that you have confirmed they are in fact great for flood, I'll just have to try them out myself.
Do you perhaps know of a way to make a diffuser, sort of like...