I also may have the option of moving to Glasgow. Which city is better?
You wouldn't be able to know without trying both, you'll find people who'll swear either is best. The attractions of Edinburgh are more obvious, its pretty, lots going on entertainment wise, its small.
Glasgow is bigger and it takes more time to discover the best bits and the longer you spend time there the more it rewards, however the appeal isn't as obvious on a daytrip. By contrast Edinburgh is very accessible, but being quite a small place and with a lot of it being touristy/superficial you can run out of things to discover quite quickly, and the smallness can perhaps start to make it feel cramped.
In many senses Edinburgh is the showpiece, Glasgow is where the real work gets done.
I've tried both and with hindsight If i wasn't expecting to live in a city for a long time I'd choose edinburgh, if I was I'd choose glasgow, both cities' main charm from my point of view is that you can escape from the city to the countryside very quickly.