Finally think I got the replication working by adding:

max_allowed_packet = 200M

In exactly the right places in /etc/mysql/my.cnf (for every mysqld, for mysql, but not in the [client] section), on both the master and the slave.

The replication is still running, but I think it will work now.