Why put any weaponskills on the presets? Just put them on the other skills. I think it limits the future build way too much if you are locked to a weapontype from the beginning and there are always people who want to do/try things differently.
You're not locked, except on companions, and I hope Larian changes that.
The presets are just guidelines. The only thing locked about the presets is their starting equipment, which is one reason why they have certain weapon skills. If you want to make a wizard who carries a 2H sword, pick the Knight preset and change everything else to match the Wizard. You want your Rogue to start out with a bow instead of daggers, pick the Ranger preset.