Notice how the scams all leading up to Japan/China were practice runs? Makoto was not in the plan on the fake deaths, you're correct on that. Laurent uses Makoto's emotions, empathy and naivety in his scams. Makoto is almost always out of the loop because it is beneficial to Laurent.