Though the threat of a U.S.-Canada trade war is on the back burner, city officials are thinking about how London can avoid the pain