What is often heard is
"Soy yo el que vine ayer a ... "
(I am the one who came yesterday to...) but I think that
"Soy yo el que vino ayer a ... "
is the correct sentence because the object that performs the action is 'el que vino' and not "yo", just that they end up being the same person (if you are not convinced rephrase in the following order, which means the same: "El que vino ayer a ..., soy yo.")
I thought that the first alternative was definitely wrong and the second right, until I read that, for instance, in French both analogous sentences are accepted.
Question: Are both correct in Spanish?