@simonw Yeah, it's a pain. That's why @Netlify built a Functions workflow. The link below will clone a starter repo containing Lambda functions, link it to a new site, add CI, enable unlimited staging envs...
One click.
https://app.netlify.com/start/deploy?repository=https://github.com/netlify/create-react-app-lambda