No the bigger thing especially seeing how even before the cards Astro is a job filled with too many abilities doing too little or doing the same thing 3-4 times would be to massively buff the 4 non-damage cards (and the two lords), and then remove other abilities and rebalance the cards based on the 120s-ish CD they now have. For improved usability keep them slightly weaker but make the draw a 30s CD (and rebalance the damage cards). Draws still alternate of course.

We have too many buttons that ultimately do the same thing in too many similar ways. Cards are cool, they're thematic, but they currently have to exist on top of the kit, instead of being the kit.