Your curricular path sounds similar to the one we use at The Coding Space (https://thecodingspace.com). Might I suggest Woof (http://woofjs.com) as alternative JavaScript graphics framework to transition students from Scratch to text based programming?