I've enjoyed playing the 5 Scarlatti fugues, available in a very well-presented modern edition from ABRSM. The counterpoint is much less strict (and easier to play) than in JSB, but sounds very convincing. The culminating sections can make a great impression with some extra bass octaves.
Scarlatti wrote a huge number of works, many of which were far from elementary. The pianosyllabus.com site has 107 entries for him, mostly the sonatas, ranging from grade 1 to 9. There's also 97 entries for Clementi. This might help you hone in on something at the right level for you.