I’m working on a personal edit of Rogue One to bring it more in line with ANH. The ending is indeed problematic. Makes no sense for Vader to see the data disc being handled. He’d simply use the force to get it. And he can’t be aware of the Tantive specifically (must be a ship amongst others).

So Vader in the hallway must be cut (possibly moving it to an ANH edit). From dialog Vader was supposed to handle the rebel fleet, so that’s what he should do - just like in ANH, he should get into his Tie fighter and engage in the space battle. Might be possible to create such a sequence by repurposing some ANH footage.

This way we can still see the disc changing hands (makes sense to be handled manually, no logs or computer records), the Tantive leaving and Leia getting the plans.
In this context, Leia sort of becomes one of the spies mentioned, carrying on the mission into ANH.

I love the movie but it does require some tweaking if you want to watch it back to back with ANH !