I think skill trees would be simpler to implement, and would essentially break the current classes up into specialized subclasses in a more interesting way. We will run out of places to use skill points within a few more campaigns so skills will need an overhaul anyway. I think that would be the superior short term way to get more specialization, subclasses, and variation of builds.