How I'd balance things...I'm too tired to explain the reasoning right now. Competent players will understand. If not, leave a question or comment.
I think these changes would put hunters and guardians in line with other classes.
Example of Athena before and after proposed changes:
Currently:
After changes: