The best I can do is tell you right now use the sorting plugin and then use the feature it adds in the context menu to push down all the Pokemon from a specific slot. So that all you have to do fix up the boxes once and then insert them properly when you catch them.
I might look into the feature but I can't give any guarantees.