Other option is to remove the counter terrorism and many of the specialist national roles from the Met and have it do the job it should be doing which is policing London. Move these organisations into a national force that deals with terrorism etc in fact use the National Crime Agency as that organisation.
The Met for years has been used by police trying to climb the greasy pole of promotion and having been in the Met is a big tick in the promotion box. In fact split the Met into two halves using the Thames as the dividing line. the Met Like ACPO before the CoP has had too much influence on how we are policed..