What if Octopussy and Kamal Khan switched roles?
I was thinking maybe it would have been better of Octopussy were the villain (of course Bond would still sleep with her before finding that out), and have Kamal Khan be an ally of Bond, much like Colombo or Kerim Bay. Have Kahn be smuggling jewels, but then it turns out, he was just being used by Orlov.
And Bond would just take off with Magda, at the end. I think maybe that would have been better cause Octopussy would have been a great villain in a way.
What do you think?