Your setup already sounds solid and thoughtful. Coldcards great but if your current flow works and feels secure no rush to fix what isnt broken.