Yes, the Z48/Z49/SW02 TailCap is designed to be capable of being tested and rated waterproof without modification.
You are correct that rotating components underwater should be avoided where possible. Using two o-rings can help improve the ability of the seal to withstand the TailCap being rotated underwater.
Al