Unstuck to your categories, Jonathan Biss's course on Beethoven's sonatas is fantastic.

https://www.coursera.org/instructor/jonathanbiss