I do it myself and I'd struggle to call it a workaround. Your solution is certainly a workaround though.
The time to pull a different card out of a different wallet is seconds. The time and tedium to re-enter your credit card every place you want to make a payment is greater. You should have backup bank accounts and credit cards anyway. What if you lose your wallet? If I do, I have my backup one ready to go.
You're worrying over nothing. You're so heavily protected by the bank that you're just making work for yourself for no benefit. If your card details get nabbed, you're not going to lose anything anyway. And hey, who knows, they might be storing your card numbers behind the scenes anyway with your order, and therefore you're not at any advantage! Or they might have been compromised and your card details are floating off every time you enter them. Who knows? In any event, I'd be more worried about my card being skimmed at an ATM. That's definitely more likely than having it compromised online.