Hey everyone, just wanted to update and let you all know that things are definitely going more smoothly now. After giving Tobias space and letting him make the first move toward me, he's back to giving me lots of head bumps and napping on me like his regular old self. I'm definitely thinking it's a case of redirected aggression and I hope to neuter him ASAP.
Thanks again to everyone who responded with tips and encouragement. I really appreciate it!