How does my crystal PCB layout look?
It looks good. 25 MHz is not amazingly fast, you can probably get away without the ring.

As a rule of thumb, things start to get a little scary above 100 MHz, a 25 MHz crystal is "easy".