parshanut torah comment - Who is speaking in Ex. 3:17?

Sh'mos 3:15–18 reads:

‏15 וַיֹּאמֶר עוֹד אֱלֹהִים אֶל מֹשֶׁה…. 16 לֵךְ וְאָסַפְתָּ אֶת זִקְנֵי יִשְׂרָאֵל וְאָמַרְתָּ אֲלֵהֶם יהוה אֱלֹהֵי אֲבֹתֵיכֶם נִרְאָה אֵלַי… לֵאמֹר פָּקֹד פָּקַדְתִּי אֶתְכֶם וְאֶת הֶעָשׂוּי לָכֶם בְּמִצְרָיִם. 17 וָאֹמַר אַעֲלֶה אֶתְכֶם מֵעֳנִי מִצְרַיִם אֶל אֶרֶץ הַכְּנַעֲנִי וְהַחִתִּי וְהָאֱמֹרִי וְהַפְּרִזִּי וְהַחִוִּי וְהַיְבוּסִי אֶל אֶרֶץ זָבַת חָלָב וּדְבָשׁ. 18 וְשָׁמְעוּ לְקֹלֶךָ…‏

I'm unsure of how to read this. Specifically, the last part of pasuk 16 is Hashem quoting Moshe quoting Hashem. Is pasuk 17 the same, or is it just Hashem quoting Moshe? That is, do we read the passage as this —

God said further to Moses:

… Go gather the elders of Israel and tell them:

God, the god of your fathers, appeared to me… saying:

I paid attention to you and to what was done to you in Egypt. And I have said [or: say]:

I will raise you from the poverty of Egypt….

And they will heed your voice….

— or as this —

God said further to Moses:

… Go gather the elders of Israel and tell them:

God, the god of your fathers, appeared to me… saying:

I paid attention to you and to what was done to you in Egypt.

And I have said [or: say]:

I will raise you from the poverty of Egypt….

And they will heed your voice….

—?