Ya that seems like the wrong thing to do, to me. It should still only cost 1 AP to swing a 1h weapon even if you're wearing a shield. You're not swinging your shield, after all..
No, that's exactly how it should be. Everything else would severly break the balance.
