You could have done a 4-year master's at Edinburgh if you went for the direct entry option.
As it stands, look at the course content. I had a friend who did CS (+EE) at Bristol and disliked it, meanwhile I took CS at Edinburgh and loved *the course*. IIRC Edinburgh's course is more theory-heavy than Bristol's, and you have much more module choice at Edinburgh because of the way the course system is set out.
Edinburgh is big for AI, which is a hot topic right now, but who can say what the in thing will be after graduation?
Obviously they're both very good universities, and you're right that Edinburgh can be a cold and dreary place if you don't sign up to lots of societies and get outside a lot.