Yes, the Qur'anic verses you quote certainly make it look like Muhammad was talking about a geocentric universe.
I'm a bit concerned that it might be a bit hard to follow due to the amount of talking. I am considering instructing the viewer to pause the video whenever they see (pause) and to read the Quran verse on screen before continuing. That way they get to read it and mentally digest it at their own speed before continuing and I get more time to talk about the verse.
But it's always good to include Muhammad's own words to clarify what the Qur'an is talking about, hence why I recommended the hadith.
The problem is that Muslims will dismiss any hadith out of hand if they don't like it, and that will discredit the whole video. The only reason I used the two that I did was because they corroborate the words which appear within the Quran and the unquestionable historical event of a solar eclipse.
Although, Muslims will probably claim that the 'joining of the sun and moon' is simply metaphorical for an eclipse, and is not literally the result of the two meeting in space.
I'm okay with that, because the Quran still says it will be the end of ALL creation.