If you can remove Sifo and the story from Obi wan in that scene in a believable smooth way, it would fix that. If it can keep the elements of a Jedi making the order and Jango keeping his line about Tyranus, the audience can make the connection that Dooku was behind it … He was a Jedi, and at the end of the film, he is teamed up with Sidious, so he is probably Tyranus (Again strictly based on “movie” cannon). But, for the entire canon, it is still vague enough to support the Sifo plot that is drawn out in Clone Wars.

I like that approach a lot … the execution of it is the key!