Thanks for the replies, suggestions and your opinions people.
I went to the shops to have a feel of the cameras and I'm liking the 6d because it feels much lighter than the 5d mark ii and I'm wanting to get into night photography so shooting in higher ISO is also whats pulling me in. As for what lens I'm still undecided but knowing I'm not in a rush leaves me some time to save up more. What lenses I end up with will also depend on weather or not I can sell my current camera + lenses and for what price.