1. Correct. We want users to be able to buy a new HMD and plug in their old compute pack, or a new compute pack and plug it into their old HMD. The compute pack itself is also upgradable (we're based off Intel's NUC Compute Elements, so it's easy to upgrade to a new CPU for example).
Component-level upgradability in the HMD itself is more difficult, but not impossible. There's a solid amount of breathing room and things are modular, so you could e.g. replace the cameras or the display/optics assembly etc.
2. Battery replacement: It'll be able to run off a USB-PD power adapter and the battery, while internal, will be easily user-replacable.