Same boat for me, I did see a video from a toyota dealership in Texas, that got their hands on a 58 pre production model. He did comment that toyota said the head lights would be interchangeable between models. Not sure if that means you could order them that way or you could order the round...