[Mr. Mojo]

Baroque.

[Mr. Mojo]

"Baroque music describes an era and a set of styles of European classical music which were in widespread use between approximately 1600 and 1750".

So yes, you were right about Bach's music being in the general category of classical music; it's just not of the classical era (1730 - 1820).