Flickr sign in doesn't work anymore

Hi there,

It's been weeks now that I can't sign in to flickr and I'm starting to get a little desperate, so I'm hoping you guys can help me out.

I have a Flickr account with the url Flickr: Wonderful Wanderings' Photostream
I remember my username, pasword and e-mailadress and I'm sure of them.

I also have a Yahoo ID and password that I remember.

I could always login using my google login, up until a couple of weeks ago.
Ever since flickr has gotten linked to Yahoo, I can't login anymore.
If I try to do so using my google adress, it asks me to either
- create a Yahoo account (which I already have
- or sign in with my Yahoo ID if I have one (which I do)

Then, when I choose the second option, I get this error message:

"Here's what going on:

Your sofie.couwenbergh Yahoo! ID uses the email address xxxxxx. That email address is already associated with the Wonderful Wanderings account on Flickr.

Here's what to do:

If you are trying to create a new Flickr account for your sofie.couwenbergh Yahoo! ID, you need to either:
Remove the xxxxxxxxxxxxx email address from your Wonderful Wanderings Flickr account. (You'll need to sign in to Flickr with your 6873bb717a85dccb8c537a1fe4e0a614 Yahoo! ID to do this.) Or,
Change the primary email address for your sofie.couwenbergh Yahoo! ID. (Your sofie.couwenbergh Yahoo! preferences.)
If you are trying to access your Wonderful Wanderings Flickr account, please sign in to Yahoo! again with your 6873bb717a85dccb8c537a1fe4e0a614 Yahoo! ID"

I have no idea what to do...
I've already contacted yahoo support several times and they keep giving me these sh*tty automatic responses that are of no help whatsoever. I really need my flickr account and have already gotten several messages on it (seen this via e-mail), which I can't respond to now.

Can anyone here please help me out???
Thanks!