It takes a convincing argument to make me admit I was wrong. And it appears I was! Point conceded, the quotes you found make it clear that Paul did have OM (particularly the one from the fight with Feyd.)
BTW, Frank Herbert once said he wasn't surprised by the success of Dune because so much planning and hard work was put into the series. So I'd have to agree with Cannabist that the story was thoroughly thought out and that OM was meant to play a part from the beginning.
Oddly, I find it very satisfying that the question is answered, even though the answer isn't what I thought it was. :)
Congratulations....