What is the difference between bipolar with psychosis and Schizo-affective type bipolar?

Is there any difference or are they just the same thing with a different name to it? Wondering because I have bipolar disorder with psychosis but my doctors diagnoses is just bipolar. He has me on a mood stabilizer and antidepressant for the bipolar but also has me on an anti-psychotic for my psychosis symptoms like hallucinating, paranoia, and delusions. My social worker said she thinks I could have it but that I'm high functioning which isn't typical. That reminded me of John Nash (A beautiful Mind) and he was extremely intelligent and high functioning yet had schizophrenia. So is bipolar with psychosis and schizo-affective the same thing, or two different illness?