After realizing that much of the dialogue in the Shaak Ti scene was later reused in the bridge scene between Greivous and the Jedi, I was a bit distraught. Of course, until I put in my copy of the Star Wars EP III Game. It has the condensed bridge scene in what I feel would be the difinitive version should the Shaak Ti scene be re-inserted:

62 EXT. BRIDGE-TRADE FEDERATION CRUISER

OBI-WAN, ANAKIN PALPATINE, and ARTOO are captured by GENERAL GRIEVOUS. They stand before the ALIEN DROID GENERAL.

GENERAL GRIEVOUS: Oh yes. General Kenobi, the Negotiator. We've been waiting for you. That wasn't much of a rescue.

A BATTLE DROID walks to GENERAL GRIEVOUS and hands him the JEDI'S lightsabers.

GENERAL GRIEVOUS: Your lightsabers will make a fine addition to my collection.

OBI-WAN: Not this time. And this time you won't escape.

ANAKIN: Artoo.

ARTOO creates a distraction by extending all his arms, shooting out electrical pulses, and bouncing around.
OBI-WAN, hands restrained with electrobonds, spins around, reaches out and, using the Force, yanks his lightsaber out of the General's hand, ignites it, and cuts his bonds. He continues to spin around and cuts Anakin free.

Atleast, that's the way the scene plays out in the game and it works well. I will just have to wait to see what EXACTLY made it into the Shaak Ti scene, but until then, this is what I think is our best option for allowing the two scenes to co-exist without it just sounding silly.