Well after a period of neglect, here I am on v.3.3.0.
Still some way to go in the whole upgrade & migration but am super pleased this worked!