I am also a admirer of your optional rule to swap the ability rating applied; this would possibly not make sense For each ability or tool, but it is a superior thing to have to the routine of for tools Specifically https://crithitceramics.com/mastering-the-rogue-build-in-dnd-a-beginners-guide/