This explains Oswald being in the "Fair play for Cuba" committee and actually filmed getting in a physical altercation with a gusano.

I think I’ve heard this as well. It makes sense that it was the original plan, but maybe they abandoned it afterwards because they thought it might lead to too many questions. Also Johnson as you said.