I'm also doing a better job of keeping up with my daily devotional reading. For that, I'm using the ESV Literary Study Bible that I received for my birthday last year. I'm also really enjoying this one. It doesn't have the notes on individual verses like other Study Bibles do, but the section notes they have for each of the sections are interesting. They really focus on the literary aspects of the text. It's a bit different approaching the Scripture from that mindset in my devotional reading, and I think it's a good approach for me. It helps me to re-examine familiar passages through a new lens and, in general, helps me to stay more actively interested in continuing the daily readings.
For my Sunday School lesson prep, I continue to rely on the various translations and tools I use through Accordance, the best Bible software in the world. It really helps simplify the work I do for class.