Jelly, Bravissimo on so many levels!
Thanks for cleaning up the puzzle in a way I could not; I was working pretty low-tech at the time. (Literally drew it on graph paper with a pencil, counted up the squares, and typed the numbers into my phone; a method I don't recommend *g*)
And beautifully solved, too!

Now I need to make another one! ^_^