Rashi's explanation that Noach did everything he was commanded

Bereishis 7:5 says:

וַיַּ֖עַשׂ נֹ֑חַ כְּכֹ֥ל אֲשֶׁר־צִוָּ֖הוּ יְהוָֽה׃

And Noah did just as the LORD commanded him.

Rashi there explains:

ויעש נח זֶה בִיאָתוֹ לַתֵּבָה:

And Noach Did- This is his coming to the Ark

However, verse 7 says:

וַיָּ֣בֹא נֹ֗חַ וּ֠בָנָיו וְאִשְׁתּ֧וֹ וּנְשֵֽׁי־בָנָ֛יו אִתּ֖וֹ אֶל־הַתֵּבָ֑ה מִפְּנֵ֖י מֵ֥י הַמַּבּֽוּל׃

Noah, with his sons, his wife, and his sons’ wives, went into the ark because of the waters of the Flood.

Rashi there explains Noach only went in because the flood forced him to

There's two ways to ask the question:

1. If Noach only went in because he was forced, why is verse 5 praising him for listening to Hashem?


2. If verse 7 (and 13) say explicitly that Noach went in the Ark, why does verse 5 need to tell me? (The Ohr Hachaim poses it this way)

The Gur Aryeh therefore explains the Rashi to verse 5 means Noach simply went to the ark, but didn't enter it. Verse 7 is where he enters it. The Levush HaOrah asks on this, that verse 5 says Noach did as he was commanded to by Hashem. Hashem told him to enter the Ark. By going to it and not entering it, how is that fulfilling Hashem's command?

At this point I don't understand how to reconcile the Rashi. How can his peirush be understood? (I understand there are other explanations for these verses, but I'm interested in understanding Rashi)