Buying interchangable needles was a huge game changer for my organization ability - they replace both circular and straight needles. Between those and dpns, I never need to buy needles unless I break or lose something.
Here is a pic of my diy dpn storage in case anyone is looking for inspiration.
Aargh Imgur is being dysfunctional.