I would go for the full testing and switch him to the other school ASAP.

And I'm falling off my chair laughing at him being gifted in passive aggressiveness. I've always felt I have a special talent in that area, too, although I was never formally identified. wink