You might really like some of Robert Vandall's books. Check out Preludes Book 1 or Bagatelles Book 1 or 2. There is a variety of pieces in these books that would be right up your alley, I think. The Bagatelles tend to be shorter, so you might think about playing two of them as a set, but most of the preludes are longer.

I'll try to think of some more pieces and give you more ideas later.