I wouldn't wait until next year. I'd make that appointment and talk to the principal ASAP.

I'd ask the principal for her suggestions. Off the cuff, I'd say she's an excellent candidate for acceleration.