I Need Help Finding A New Main

Season 6 I pretty much one tricked Nidalee, and had over 500 games with her this year. Until Riot fixes her problems I need a new main. I'm struggling to find what I want to play though. I would play Nidalee both Jungle and Top, but now I have been playing middle since I can't play her top with it being so garbage into a lot of meta champions. I'm looking for recommendations on high skill cap top/mid champs as I want to transition out of the jungle because the only reason I played it was for Nidalee (all of my favorite junglers have been changed so much, and they don't feel as fun anymore). I will say, I have thought about being a Riven or Yasuo main, and I have like 125k points on Riven across my accounts and would need to put a lot of time into Yasuo. I'm just not sure what I might have the most enjoyment in playing. P.S. when I say high skill cap, I mean they have to have mechanical depth, not just a difficult playstyle