I mean, people can try to parse and re-parse these interviews to hope it will create an entirely new narrative both for what you have already seen and what you are about to see, but it's not going to change anything.
In short:
The Engineer is the space jockey and vice versa. There is no evidence in either
Prometheus or the upcoming film that will say otherwise.
There are no 'factions' of Engineers. Again, no evidence otherwise.
Alien: Covenant wants to put as much distance between itself and
Prometheus and the Engineers/space jockeys as possible and get back to the fundamentals of
Alien material which the studio and director feel will please a larger audience.
The only question Ridley Scott intends to change or answer in future is who created or helped re-create the alien. And that answer is very likely someone who will feature in
Alien: Covenant, not some surprise third party.
Trying to invent a whole other wild backstory by struggling to re-interpret interview quotes which say something entirely is to me just an attempt to avoid dealing in the blatant facts of what is (only IMO) an unsatisfying story and future direction for these films. As in,
Spoiler
David Did It.