What's your plan to go up to higher frequencies? Start with instruments like the 8340 and use doublers etc?
That is one possibility. Another approach I think about is siggen + harmonic distortion + filter bank.
I am very worried about phase noise, especially as I climb the spectrum. But I think I am comfortable working my way up. Maybe I'll have to sell a less capable machine to finance a more capable one, but I'd rather have some experience under my belt before investing more money, even if it costs a little more in the long run.
But maybe a lower phase noise fundamental out of a sigal generator is worth some extra complexity now to save myself some growing pains later!
Tough decisions!