Make Longsword, Heavy Bastard Sword, and the Bastard Sword have primary\secondary mode alternating between 1h and 2h rather than the awkward and unpractical *1h if you are holding a shield, your shield broke and you are a one hander? Tough luck.*
These weapons were and are perfectly suitable for one handed use etc etc