“Or perhaps, Hashem told Moshe only one opinion but somewhere along the way, someone got another tradition that got passed down and both opinions got recorded?”
We say אלו ואלו דברי אלקים חיים so both are true
Which means to say your first answer makes more sense