With the addition of melee weaponry, I think that Medic/Engineer should be given unlockable swords as melee options. A katana would sell best.

The movement speed would suffer slightly due to the extra reach of the provided weapon.