Comic collectors, how do you store and manage your collections?

My current collection is over 3500 individual issues with the 2 most numerous publishers being Marvel and Image. To try and make things easier I have a series of boxes devoted simply to image comics, sorted alphabetically. The downside is when I go to add issues to the A-D box, it becomes full, so I need to move a chunk of the D's to box 2, which then fills up and need to keep shifting down until I need a new Image box for T-Z. Even more fun is I digitally track with CLZ app and have to make large moves there between boxes.

Do you also fall into the same trap of constantly adjusting boxes or do you have a better system?