You are so going to hate what is coming in 
There is no need to move anything around with the present badging system and the badges we have currently fit nicely into the spaces allowed. The only exception may be for cadet50/100 which starts to look ugly as you add years.
The planned system is for a range of badges per activity based on colour (blue, bronze, silver, gold) and a progressive system of achievement for the various disciplines. There will be more removal of badges then, but at least they should be replaced by identically sized and shaped badges (hint hint) so won’t leave a visible mess.
On that point, we could really do with a new first class badge - same design but on a square backing.
The small FA badges were brought in as the ACF need to cram stuff on to their PCS blanking plates. They look silly on a brassard.