Have you also looked at Snap! (https://snap.berkeley.edu/), by any chance? It's basically Scratch but with the artificial limitations removed, e.g. you can pass lists to functions, and blocks (functions) are treated as first-class objects so you can store them in data structures, pass them as input to other functions, and basically teach students proper functional-programming thinking (to find the odd numbers in this list, just pass the "is odd?" block as input to the "filter" block and you're done).