How I would re-write The Man With The Golden Gun
Keep the first act of the movie as is. Cut the sumo wresting and kung fu. Have Goodnight stay with Bond as his companion, replacing JW Pepper instead of being kidnapped. Bond dines and duels with Scaramanga while Goodnight secretly disables the solar facilities. Scaramanga's plan is to monopolize solar power and refuse it to the west instead of a giant laser.
I always felt like the premise of the movie was great. My revisions may work as a modern remake with the next James Bond actor.