The difference between two sentences

Hello everyone.
I would like to ask you something about functions of prepositional phrases and to do it, I have two different sentences but they have the same construction.

1-) I bought the toy from the toy store which you have wanted for a long time.
According to my opinion,
That sentence is not correct. Because it seems like you have wanted toy store.(Okay it doesn't make sense but gramatically it seems like that)

So, I would like to correct it like "I bought the toy which you have wanted for a long time, from the toy store.
I think, it is much better.

2-) I bought the toy at the toy store which you have wanted for a long time.

I think, It is possible and correct. Because the bold part are together and "at the toy store" identifies "the toy". This is why I think that is correct.
But in the other sentence, "from the toy store" doesn't identify "the toy".

Do you agree with me? Thanks in advance.