Yup sounds good. I would recommend checking squish while testing both sides of the piston in the same direction the wrist pin sits. You will get a little rocking if you test just 1 side at a time.
I'd like to try something different than ATF. I see a little creep at the dunes but nothing too bad. The crap is $4.99/quart now so it's really not worth the "cost savings" anymore. And trying to save $5 on a $1500 motor is stupid.
A 4mil cub will be pretty peaky trying to dune, not unrideable but not ideal. A 4mil serval might be just what you need. 80-90HP on pump gas and a little more bottom end.
I have cases on both my phones, mainly because I used to drop them all the time. I can't say how many times it's bounced around on the concrete and not shattered.