I've had a similar path, and I always recommend KDE with its taskbar on Ubuntu, it made the transition smoother for me in terms of preserving workflows.