Was Noah now saved from the flood? It does not seem so, God gives him more commandments to follow
Gen 6:13 Then God said to Noah, " The end of all flesh has come before Me; for the earth is filled with violence because of them; and behold, I am about to destroy them with the earth. 14 "Make for yourself an ark of gopher wood; you shall make the ark with rooms, and shall cover it inside and out with pitch. 15 "This is how you shall make it: the length of the ark three hundred cubits, its breadth fifty cubits, and its height thirty cubits. 16 "You shall make a window for the ark, and finish it to a cubit from the top; and set the door of the ark in the side of it; you shall make it with lower, second, and third decks.
God has really piled on to Noah now. Just having favor was not enough, now he has to build an ark. Noah can not build it he way he wants to either. god gave him very specific instructions about the construction. BUT, Noah is still not saved from the flood. His Faith has to be followed through. Gen6:22 Thus Noah did; according to all that God had commanded him, so he did.
Gen7:1 Then the LORD said to Noah, "Enter the ark, you and all your household, for you {alone} I have seen {to be} righteous before Me in this time.
Noah must be saved now, God said he is righteous. Maybe some think he should have stopped there, but Noha did not, he followed through with more commands.
Gen 7:5 Noah did according to all that the LORD had commanded him Gen7:7 Then Noah and his sons and his wife and his sons' wives with him entered the ark because of the water of the flood Gen 7:23 Thus He blotted out every living thing that was upon the face of the land, from man to animals to creeping things and to birds of the sky, and they were blotted out from the earth; and only Noah was left, together with those that were with him in the ark.
So Noah had to keep following through wiht what God wanted in order to attain salvation. God REVEALED Himself, not enough, Noah Beleived, not enough, began building the Ark, (compare to repent & confess), then Noah had to enter the ark to be saved (baptism)
It was not just one thing that God commanded that saved Noah, he had to follow through with all of it. I Peter3:18 For Christ also died for sins once for all, the just for the unjust, so that He might bring us to God, having been put to death in the flesh, but made alive in the spirit; 19 in which also He went and made proclamation to the spirits now in prison, 20 who once were disobedient, when the patience of God kept waiting in the days of Noah, during the construction of the ark, in which a few, that is, eight persons, were brought safely through the water. 21 Corresponding to that, baptism now saves you--
Not following through with baptism when it is a clear instruction is disobedience to God, and is probably a sign that the FAITH wasn't real in the first place.
I would agree with everything you've said but what was it that made Noah righteous? God gave the instructions and Noah obeyed. God also gave him all the skills and fortitude to help him complete his task. Likewise God gives us our instructions and skills. It is He who bears are fruit.