I fiddled with Prelude (no fugue) No. 5. score | mp3

In short, I removed m. 17 and smoothed that break over, and adjusted the implied chord progression at the end. It’s tighter and better.