Don't just copy the HD2010 pill. Allow it to take a 20mm star and 17mm driver, but with enough mass underneath to allow the pill to be bored out to accommodate a 20mm driver. You could ask MRsDNF for the design, then you'd have a pill that's better than what vestureofblood did with his pills, and it'd have more thermal mass too.
Another replacement pill could be for Convoy, especially if there's a pill that's used for multiple popular lights.