If I were to 'fix' machinist in as little dev time as possible. I would compile and ricochet and gauss,buffing the damage and making them actions that you can only use in heat blast, but also refunding them when you activate heat blast. Then I would turn AA into an ogcd. That's ofcourse if we're sticking with the 'glass cannon phys range' idea.