Nice Sebastian
Excellent work- "I think I prefer the flexibility this approach offers"; for gaming I'd agree, however some interlacing of bases would effect a much grander vista.
The 'staff' as you call it is missing two critical elements- the immediate 'friends' and ADCs to the Emperor, and the Etat-Major Generale headed by Berthier, almost always present, and their respective ADC's.
The 'maison de l'empereur' consisted of personal servant Roustam, one row behind; Imperial ADCs (a new one on duty every day); GDV Duroc and Master of Horse and junior ADC's attached; and Junot* was frequently seen (painted) in this group as he did not take many battlefield commands.
Side by side are the Major-General and his tiered staff, any specialists required and/ or local guides.
Behind would be the Chef de maison and the pages etc. Closely attended by the immediate escort (your pair of Chasseurs) with duty squadrons about 50 paces adjacent or behind, remaining mounted.
On the opposite side would be other Marshals, Generals and ADCs by the dozen!
Thus you have a 'layered' pattern and groupings of the 'head quarters' around the Emperor. Each encompassing it's own status and familiarity to serve him, with a panache of uniforms for each.
*Dressed most often as Colonel-General (ie Inspector General) of Hussars wearing General of division insignia, as a very close 'family' friend of Bonaparte.
NB Disclaimer- I am yet to do this same in 25mm, having all the elements necessary to customise the individuals concerned, but I also make each commander in gaming sense a 'vignette' appropriate to his station.
regards
davew