The layout is actually really good, assuming you don't have anything else tied into it (like an enable wire). I would like the diode closer to the regulator, like wedged inbetween the reg and boot cap, but it's really not terrible where it is. (It could actually affect compensation, in that the compensation network is laying over the regulator-diode switching loop, which makes it susceptible to its own noise. Hopefully, it's made to deal with this, and will be okay.)
What's good about it? You have the input and output at the same place, with caps stacked up around ground. This shunts as much high frequency content as possible, to ground, at a single point, so that there is little difference in the RF voltages at the three pins.
There will still be some RF leftover, which I guess is what you're seeing. Maybe it's quite a lot after all, since it's getting through the 20MHz BW limit.
The simplest solution is to follow up the input and output with an LC filter. Not much will be needed, maybe 1uH and 10uF (ceramic)?
Tim