Do you think that upgrading blocks should use the materials, or the blocks themselves?
I.e. 10 cobblestone, or the cobblestone placeable block?
Additional,
Aware this would require more than just xml change, but what about both?
Maybe give the tools themselves the ability to switch between...