I think the OP is conflating matters that were originally conflated by the theoretical community. Aspect makes the point that until '82 even Feynman did not note the distinction between wave/particle duality and entanglement (only the latter demands non-local aka "spooky" action.) It was only after Bell, et al that e.g. in '82 Feynman recognized the distinctions and per Aspect "typical Feynman he then invented Quantum Computing".