I think clean install must be the answer tbh - I upgraded too. I'll let you know if I try it, maybe over the weekend.