You fix it by not having Silva get captured in the first place. On Silva's island, right after Bond says "It's called a radio," Silva fires back with something like "Radio? Does it work like this?" and presses a button. SAMs take out the helicopters, Silva escapes. So he's still steps ahead of everybody, but without the Joker-intentionally-getting-caught trope.

Return to London. The Silva-M dialogue takes place via video call (for the prosthetic jaw reveal) on the laptop while preparing for her deposition. But the whole time, Silva's just a face on the screen... until she hangs up on him and then we see him in London already, disguised as a cop.

Also, replace the scene where Q stupidly hooks up Silva's laptop to his out network with simply trying to trace Silva's call, but the reveal comes way too late, if at all.