Sounds good to me, though #2 increases the complexity somewhat.
I'm playing in a campaign now that uses the following homebrewed modification to the skill system:
- Spot and Listen are class-skills for everyone.
- All cross-class skills only cost 1 point (instead of 2). The limits on cross-class skills still exist.