Cool, reminds me of some Gokor and Erik Paulson Sambo/ Catch stuff, though I like your detail about elevating the hip in the high kneebar, as well as the importance of having their ankle across your calf and not in the put of your knee for the reverse kneebar.
Paulson shows some toehold options in this vid from a few years ago, setting up the high kneebar from an armlock escape.