I always use "larger drive" as an excuse to reinstall everything from scratch. I can usually have the thing serviceable in an afternoon.