Unfortunately I think you’re half right. Samsung are used to producing their current top end OLED screens only in their top end S* and Note screens. The kind of volumes that Apple will need will dwarf that.
Good point. Apple depending on Samsung is a bit hilarious considering how just a short while back everyone was raving about burn in and how LCD was the best. I like LCD and OLED personally. Both have their pluses and minuses.