Wanting

I can't tell if I have two past events here. Are both of them appropriate? Which one would you use?

And what do these ones mean?

1. I have been wanting to say that to her for a long time and I finally said it yesterday.

2. I had been wanting to say that to her for a long time and I finally said it yesterday.

Thanks.

I agree with Paco.  Yet, don't be surprised to hear a native speaker use the first one (to mean the same as the second).  It doesn't have a particularly jarring ring to it, and most listeners will mentally adjust quickly so that accurate communication is not really impaired.

CJ