Just never sign a transaction unless its locktimed for at least 5 blocks in the future. TADA "undo". Enjoy.
I like it! OP could even patch one of the open source wallets to do this for him. It'll just be annoying though: waiting for 1 confirmation already feels slow when I order something.