That's a smart way to go about it. I took the slow road and switched to a couple different distro's but haven't had the time/balls/attention span to go deep on QubesOS. I went complete airgap with purism though and its been pretty useful Its the compartmentalizing that I tend to be attracted to.