Always be wary of "self-diagnosis" and online tests, they're rarely accurate.
It sounds like you've got a good plan there

but unfortunately yes, the waiting lists can be a right pain. And if you're suffering you could really do with getting yourself on the list.
Remember, if you ever do want to talk, we're all here to listen.
I hope you can get to see another Dr soon! Failing that, if you really had to go back to your original GP, could you take someone along with you to speak up for you?
Take care x