Figured it out. I reverted the message macros template. This fixed the PM and profile comments avatar issue, but this knocked my avatar size back to the default 96x96. Then I went back to the avatar template to increase the avatar size back to 120x120.
We're good. Sorry for making this thread. It really did fry my brain for a while.