Oh, what may also work (and be slightly more efficient as it avoids starting two shells each time), is to set zsh as your default shell, but to add this line to your .zshenv file:

I checked that it allows Xsession to run correctly, but I still haven't been game to boot my phone with it like that. Wouldn't mind confirmation of that either