I think you may be right that an Executive Order could vitiate Administrative Rules as they both flow from the Executive, and Trump can trump the bureaucrats. (we hope).
EVEN if they do add government appointees to the civil service list, there is nothing stopping Trump from moving their bureaus and offices out of DC.
Just don’t move any to Alabama. Alaska, Wyoming, Mississippi is better.