im generally not a fan that each weapon = only 1 class. what you have in your suggestions are pretty much what most of those classes are, with some minor changes, which seems kind of meh. I think the fact that the classes right now are limited to the weapon they have kind of hurts the "jobs" system they want to do. Your always stuck with that one weapon means you cant branch the jobs. ex: GLD could be PLD and DRK, but having all of them use a sword only kind of makes them feel no different.

Though i guess they could always down the line make weapons like say a "scythe" that is GLD/DRK to use it, the only thing that the GLD form gets that makes it different is only weaponskills, where as the DRK gets all of his special skills.