I'm a hobbyist/enthusiast like you.
I'm not a professional nor am I planning on becoming one.... so I'm happy with my 60D... its only slightly professional.
However, in my opinion, the WIFI on the 6D is very tempting.
If I was going to buy a future FF, whether it be a 5D Mrk(whatever) or 6D Mrk(whatever), I would wait for the WIFI.
And, I will tell you why... there is an app on the iphone and ipad called "DSLR remote".
Currently, if you don't have WIFI on the camera, you need to connect your laptop (which would have WIFI) to the camera and then you can use "DSLR Remote"
DSLR Remote is cool especially if you have a ipad, because it acts as the LCD. You can just sit down anywhere and take your picture, and you can preview the picture (on the 10 inch ipad screen) before taking it. Same with video... imagine making sure the focus is right on 10 inch vs. the 3" on the back of your camera.
So with WIFI, you have only Camera with lens + tripod + ipad to take pictures/video with DSLR remote
Without WIFI, you need Camera with lens + tripod + laptop + something to hold laptop + ipad to take pictures/video with DSLR remote.