Here's a trick that might help:

Before removing your rear wheel, shift into your smallest rear cog. Now when you go to put it back on, your derailleur will be lined up nice and neatly and you'll have one less issue to mess with.