A few things to keep in mind:
1) If you don't need GPIB, a 5315B will have the same features. In fact, the main microcontroller used is the same mask from part. The oscilator mod works on both.
2) The OXCO mod is well worth it if you can't find one with the factory option
3) If possible, I would look for a unit that has the third channel installed. That will allow you to go up to about 1.2 Ghz or so.