First, don't look at anything that shows dots and dashes by eye. Re-learn by ear only.
Second, re-learn copying CW.
Third, re-learn sending CW.
I did all of these wrong, and it cost me.
I really like "Just Learn Morse Code". It is available for free download at:http://www.justlearnmorsecode.com/
After you re-learn the basics, and if you want to get into contesting assisted by your computer, nothing is better than "MorseRunner" which is also available for free at:http://www.dxatlas.com/morserunner/
Morserunner gives you a very realworld contest/DXpedition scenario where you are the contester or DX op. It's fun and will raise your copy speed dramitically in a short time.
It's good that you are back into CW. Welcome back, and I hope to hear you on the air.
73 de WE5I