Tuttle "Learning Chinese Characters" by Matthews and Matthews is organized in the way you mention. I find it highly recommendable, although I can't compare to Heisig's book because I don't have that one.

It only has 800 characters, though. But they are the most common.