Get a second opinion because the meds are not working not b/c you need a different diagnosis, it's just a label. The treatment is what matters. But be sure they know what you've told us about being depressed 3 years ago and started cycling when you did, and that the current meds are not working with your current symptoms.
If a BP diagnosis is an automatic discharge and you suspect the doc is keeping that diagnosis from you to keep you from having to be discharged.... he is treating you in the process with appropriate meds for bp regardless of the diagnosis. Treatment is never a fast process but does need to be adjusted if not working, so you have to go back to him or get a second opinion as it is not working. BUT you also have to decide if BP does become your diagnosis from either the primary treating doc or the second opinion, are you prepared for the discharge? He might be protecting you if you are not ready for that, as too many changes at once sometimes can be more harmful than helpful. So no matter the diagnosis, as long as you are being treated is what is important until you know what important to you...the label or this career, but continue with treatment in the process.
My doc won't actually discuss dx with me as he says the focus becomes about the label, and negatively so, and not focusing on the treatment. Whatever the diagnosis, as long as I am being helped, I don't actually care what they call it.
Hang in there in the meantime as I know it is not an easy time. Sending good wishes your way.