I still love the Engineers. I think they're hugely creepy. But I'll never not want them to be something separate to the actual Space Jockeys, so I still have to cling to the fan theory that the Engineers are just imitating the Jockeys.
Hell, the black goo/Aliens could have been something designed specifically by the "true" Jockey's as a combat to the Engineers, which is why they also seem so suited against mankind too.