TBH you might prefer some contemporary jazz that's explicitly influenced by classic rock, prog etc and thus less improvisation-heavy. Check out Ben Allison (https://www.youtube.com/watch?v=H1MPhm4_b1s), I'd be shocked if you weren't into it. For albums I recommend the linked one (Little Things Run the World), as well as Think Free, and Action-Refraction