So your DX has stayed the same? I don't know enough about the difference, but if the psychosis is related to a bipolar episode, then it's bipolar with psychosis (?); however, if it's not related to a bipolar episode, then it would more more along the lines of sza (?) I am guessing, but that's my understanding. Hopefully, brighter minds will come along to clarify.

As for your second goal, could you putting getting on a regular sleep cycle or just getting sleep?