After a few busy weeks, I have had time to spend on this, and I’m pleased to say the migration went well, and I’m running on MySQL 8.
I’ll post the steps in another thread, as this may be useful to others.
I was able to use the Ubuntu repo this time, so I’m uncertain why it failed last time around.