Along with what others have suggested on the swirl, what about trying to render the swirl in a different way. Maybe more geometric, maybe 3D, maybe more hand drawn, etc. Push the swirl a little more. I think the swirl is what will make or break your redesign of the logo. Good luck!