How about a P7M13, Sig 210-6 or custom hi-power in 9; Rock River, Wilson, Baer or one of the fine smiths on these boards for .45. Fred Craig also makes some interesting customs on Caspian frames-no website but he got me a brochure in the mail in 3 days and he answers his own phone. You could also redo one of your Glocks with a Bar Sto or Jarvis barrel, Caspian slide, MMC tritium adjustables and a "hand job".
If you go the rifle route, you could alsmost get a loaded Steyr for 2K, you could get a fully decked out AR-match barrel, good optics, sf Millennium light, etc.
Good luck deciding,
pojim