Fantasie Impromptu by Chopin and now what?

I have been working on Liebestraum for 4 months and Fantasie Impromptu for about 2 months. I am ironing out some bumps in that last damn cadenza in Liebestraum, and I'm working on the C section of Chopin Fantasie Impromptu as well as playing through it fluently while trying to figure out how to properly use rubato in certain parts. Those two pieces kept me busy for the summer as well as the first month of school, but now I'm trying to figure out what piece would be good for me to work on next. I am mainly looking for a technical piece, preferably from the Romantic or Baroque period (Bach and Chopin being my favourite composers of the respected periods). I am doing music in University right now, but my major is Tuba so I try and fit in as much piano practice as possible. I have also been without a teacher for the past 3 years, so I want the piece to be something that I won't butcher with bad technique. I am open to all suggestions, and if it helps I also have Maple Leaf Rag, Chopin Nocturne Op.9 No.2, and Claire De Lune under my belt. Thank you in advance!