In D major either of the preludes and fugues from WTC I or II are pretty darn baroquey. If you're willing to try a minor key, the Ricercar a 6 from the Musical Offering is wonderful, chromaticisms, complex counterpoint - it's Bach at his most cerebral, but also quite an emotional piece, I think. And definitely hard enough.