That seems pretty reasonable. I think I'll go ahead and modify my stats to fit that.

EDIT: Wait did you forget luck in that new system or are you removing it?

EDIT 2: Redid Jarvoff's stats. Turns out I was already only 1 point off from 18.