So, my partner pointed out that what I had as intelligence seemed more like wisdom. We looked it up, and wisdom definitely fits better, intelligence being too much of an umbrella term.
That fixed, I went ahead and finished relating attributes to skills. I still need to do the whole skill bonus thing, (kinda like skill affinities or cross training benefits), but that'll be for another day.