Without checking up anything: University of L'pool, without a doubt.
I think they have a great PG programme, so the UG one probably is sound, too.
Don't worry about the motivation..your first year will be ALL the motivation you'll need..you'll literally feel like you're punching the stratosphere.
The first month of the very first semester is BLISS.
Discipline? There's a very methodical-to-the-point-of-being-pedantic scholar inside of you.
You could either release it totally, or just use it when needed and push it back into its lamp. Warning: you release it fully and you could end up like Keats (on the bright side).
Again, let me make it clear to you: bring back a First Class degree or nothing. I'll PERSONALLY supervise that.