It's a shame that Hasbro didn't bother doing any retooling of this mould. I get that Sixshot needs to be redecoed as something and there's pretty much no other choice, but as you said, a retooled helmet and beast mode head would've gone a long way. They should've gang-moulded Sixshot with variant parts of Quickswitch (which they could then repaint directly as Sixknight) and Greatshot. We know that Hasbro are more than happy to release obscure Japanese G1 characters as evidenced by Black Shadow.

It'd be interesting to see if TakaraTOMY would bother to do any retooling of this mould should they choose to release it as Sixknight or Greatshot for their market.