Or other idea: 1) If you want hammers be consumable, give them 'durability'. For example: A repair hammer has a durability of 100 and can therefore repair 100 points of durability, before he gets broken.
I see where you're coming from, but this change alone would seem to leave the existing repair mechanic otherwise untouched, which wouldn't be good. It's the ridiculous amount of clicking across up to four party members' inventories on repair hammers and dozens of pieces of equipment that completely puts me off.