Sounds like fine plan to me
I suspect you are hearing more slow code lately because it's new years day. "Straight Key Night starts at 0000 GMT on 1January every year. Lots of folks break out the straight keys and some of them fire up the old tube rigs of yesteryear just for SKN.
Even without the new year straight key party, there's usually a good bit of slow code happening on the 40M band. I think half of my log is 40M QSO's.
I prefer listening to actual QSO's over computer practice. It's especially helpful if I can tune in a QSO running near my speed limit, where I can hear both parties reasonably well. Max speed gets exhausting pretty quickly though. I think time spent copying at easy speeds is still helpful.
For me, the greatest improvement came when I switched from paper copy to head copy. That was the point where code changed from work to enjoyment for me.
Since the XYL works nights, I have a SW radio next to the bed. I've been lulled to sleep by the dulcet sounds of CW on more than a few nights. Unfortunately, this leads to the occasional rude awakening at 3am, when a strong station starts calling on the frequency where I left the radio
Well, best of luck with the code work. Hopefully, since you are re-learning, it will come back quickly for you.