further updating for self-address invalidation msg

Decided to move the self-addressed invalidation message check as soon as possible to cut down on computing 5 extra lines of code if the message won't actually be sent.