Apostle George Q. Cannon seemed to start Joseph's call with the vision of Moroni. He did mention that Joseph saw Jesus and God but did not put those experiences in the framework of the first vision:"He [Joseph] was visited constantly by angels; and the Son of God Himself condescended to come and minister unto him, the Father having also shown Himself unto him; and these various angels, the heads of dispensations, having also ministered unto him. Moroni, in the beginning, as you know, to prepare him for his mission, came and ministered and talked to him from time to time…"
[A Documented History of Joseph Smith's First Vision, http://beggarsbread.org/2013/04/01/a-documented-history-of-joseph-smiths-first-vision/; Journal of Discourses, Vol. 23, p.362]