For Bond 24 or 25 it would be a great idea to end Craig's run as bond with Jinx returning as a villain. She would get her revenge on Bond for skipping town on her after their romantic getaway on the korean countryside in DAD. End Craig's turn as Bond with a similar ending to Layer Cake, except instead of being shot in the back- have him lose in a climatic epic fist fight with Jinx, with Jinx as the victor. The setting could be on a beach in Goa or a subway in Moscow. This would be more surprising than a bullet in the back. It is also great to have a hottie like Berry (though they could replace the actress) be as physically capable, or even stronger (and willed) than Bond. If they were to replace Berry they should do it with a big time oscar caliber actress to rake in some dough.. perhaps Angelina Jolie or Kristen Dunst.
Bond 25 or 26 would then introduce the new Bond actor as a "tougher and stronger Bond" in order to return the favor on Jinx. Some futuristic cyborg type body replacements to fix Bond after his tangle with Jinx in the previous meeting would also be added. Not only would their be a great revenge story aspect like DAF and a new tougher Bond, but the ultimate Bond gadget: cyborg body parts. Parts of his back would unfold opening up to an array of weapons and gadgets all to the tune of blasting Bond music. There would have to be at least one scene with his hand shredded and the metalic skeletal hand gripping the throat of a baddie (or the hand of a 'conquest'). They might have to move this up to keep from having Berry too old for the role.