Totally for 1), not really that much for 2). Just remove repair completly, instead perhaps add the ability to dismantle stuff for crafting materials.