Looks correct. The safety compresses the disconnector down to keep it from engaging the sear when on safe, which explains your current's shorter nature. Counting the number of loops in the spring is a good way to compare the springs' strength, rather than overall length.