The Luckysun D80 if you can get those they are fairly similiar to the X6 the reflector and heat sinking is around the same size. Just a different driver 20mm on the D80 and 17mm on the X6. You could try the Ultrafire F13?
Id buy more X6 if you find any. What about the Banggood edition of the X6?