Yes. It’s thematically linked more than logically. The same point could be made about Luke in ROTJ; presumably, the team would have destroyed the Death Star regardless of Luke’s success or failure onboard.
Yeah but that’s one thing I like with ROTJ: there is a rehash of the Death Star but it’s not the heart at all of the story, just another story in the background to bring the chain of events in one place.
That’s being said, you should indeed stick to the v1 version of the destruction of the NR.