If you want to go in the jazz direction, the Jazz Piano Book by Mark Levine [1] is great! It has everything a jazz player needs to know, from II - V - I voicings to scales, upper structures, etc.
Oscar Peterson has a nice series of étude books, too – it's not an exhaustive course, but he was a great pedagogue and expositor, and he really did care about the classical training he got as a wee one.