Decided to keep it after shooting it again yesterday, so instead of the D7000 replacing the D300s it's become 'in addition to'. Will have to find another way to fund the Nikon 70-200 VRII I guess.
Yeah, I like it a lot and it's suited me well over the last year so it's really hard to part with especially since the D7000 doesn't fit all the holes left by not having it. On paper it sounds like the D7000 kicks the D300s' behind, but in my experience I can't say it does.