Thanks guys, I managed to upgrade and all went ok (not using the new entity IDs just yet but that’s another day).
I think I will do a complete fresh reinstall using the all in one installer (that’s what I did last time) on a new pi SD card but wondered when will that include python 3.6 as the upgrade steps look a little hairy: