I bought some aftermarket vanos solenoids just to try in my 23i. Seemed to make things worse, so put the old back in. Keep as emergency back up.
I wouldn't buy aftermarket, if you really need them, buy genuine and take the hit on cost.
Some times the adage "if it ain't broke, then don't mess".
This happens a lot in aviation, parts are replaced on life and the replacements are worse than the old part.