Finally fixed issue with PATH via workaround.  It seems like zshenv still isn't being sourced for login shell