I would rather suggest you to work on baroque e.g. WTC, suites, partitas, etc. for now since you mentioned some having issues there. Many large scale works have polyphony characters, and many of them even have a movement is written in fugue, e.g. Beethoven Piano Sonatas nos 28, 29 & 31, Barber PS, etc.