I think moving the archer’s base damage towards his bonus damage is the most practical thing to balance this once and for all.