I really like the way you distinguish between the two as a matter of intensity and choice. In particular, that hyperfocus is a choice, and hyperfixation is not.
Then you throw in Autistic inertia - which I find is more intense when I'm hyperfixating - and it's a struggle all around.