That's a good idea. I don't have the headroom, but I can make it - I have more than enough G-BW in the output amplifier to reduce the signal level in the VCO and boost it back up at output.
I think it's time to spin a new PCB. God, I hate doing that.

I might play around with replacing the comparator, too. LM7171's not a comparator, it's an op amp, and it won't give a very clean output above 1.5 MHz or so. I used it because it was all I had on hand that would even go that fast. The 3312A uses a discrete-transistor comparator that should work fine, I might do that too.
And there's nothing I love more than etching PCBs, other than matching transistor pairs...