I just noticed Instek has a cheap (albeit fairly crappy) 3GHz spectrum analyzer out. It costs under $1000 but doesn't have a tracking generator, only 100dbm sensitivity, and most notably crippling... a minimum 30kHz RBW.
I still say the Rigol DSA-815-TG is the best SA for under 2k if the 1.5GHz limit is acceptable to you, but perhaps if you need to do 2.4GHz work this may suffice.