I loved Edinburgh when I went. I thought it was the most beautiful city I had ever visited. Its not just a tourist trap, its stupendously breathtakingly beautiful.
I would definately go. Architecture is second to none, shopping is great, nightlife is really good fun, theres a FAB vodka bar, and a REALLY cute italian who works in a leather shop!
But dont bother with Glasgow, its shite! (KK runs for cover)