Every one - thanks once again for all you replies/advice.
I suppose it has been a confusing time of change in my life & probably will be for some time more.
Hmm, this started out asking about giving up aikido, but I realise that there's a lot more behind it there!! (apologies there)

A lot of the problem has been that the feelings were mutual, & therefore I know that finding another dojo may be the best/easiest solution. And yes, I know I have to take responsibility for the situation.
However, that said, I feel the dojo is still the best for me & it would be possible to train without seeing this other person.

I'm coming to my own conclusion that it may be best to find another dojo. And that I may be able to return to my current dojo at some point in the future when things are a little less complicated.