Comparing Edinburgh/Glasgow for the Big Move!

Hello Everyone ;P

I and my boyfriend are looking to move to Scotland towards the end of the year, this has been in the works for the past year or so and finally it is looking possible! The choices are of course between Glasgow and Edinburgh. Glasgow as it is larger, a more industrial city, and Edinburgh for its beauty.
We are both in web/graphic design with IT incorporated, and I was wondering if there are positions in these areas. Meaning that it is a heard of industry. Also, what is the quality of life, entertainment, etc. for either cities like?
I am looking for pointers, pros and cons pertaining to both cities.
In general we would love to be in a city where there is a lot going on, pubs to go to, music venues, museums, some parks, small stores, not out-of-the-box stores, different kinds of people, and perhaps also some nice scenery, even if it is on the outskirts...
I am American with a strong European background and my boyfriend is Greek. As for culture and getting to know people, is it more difficult being a non-native? We are pretty outgoing, friendly people which will hopefully make it a bit easier!
Any kind of advice would be much appreciated