Something I think Shapeshifters and Drakes are lacking is the ability to partially shapeshift, so as to use natural weapons and other traits in metahuman form.

But here's a simple solution: giving such Shapeshifters/Drakes the Adept or Mystic Adept Qualities, and then give them Adept Powers appropriate to their alternate form. Such as Killing Hands and Great Leap for a Leopard Shapeshifter, for example, with the special effect of partial shapeshifting.