Not sure what to tell you other than, you have to work within the confines of the system that they built. Could they make it easier to HQ by changing those two points you mentioned? Sure, but HQing is already so easy* that they probably don't want to make it any easier.

*if you have a ton of cross-class abilities, great gear, and/or know what you're doing.