Macro level people… remember that. Axis & Allies utilizes a world map and there are references to some division level forces that were used in a small percentage of the battles during WWII. That is a micro level. You can not really mix the two very well, it just doesn’t work out, IMHO.
There are plenty of games that deal with the micro-level of battle if you want that sort of unit.
The only tricky move in combat and non-combat of the same unit is armor, really. Armor may blitz into and out of combat during the combat move phase. (Assuming the territory blitzed was empty.)
Other then that, “combat” ends all movement. (Aircraft exempted.)