Good luck with that GP giddy kitty. I hope that GP listens to you.
In my humble opinion and experience, having NO diagnosis is much preferable to having an incorrect diagnosis.
I have not read all your posts but I too sense some ''normal'' moods and not a diagnosis of a Severe Mental Illness. Believe me, you do not want such a diagnosis if it is not correct, and neither would you want the heavy duty ''meds'' which would often accompany such a diagnosis (whether correct or not)
Aside from that, on pc, I'm not sure if you've explored the ''games forum'' - there are many word games etc which are good for distraction.
I too recommend DBT, this helps many, with or without a ''borderline'' diagnosis.
much love