Congrats on getting it ironed out. Is someone going to replace the defective battery?
Has any Canon camera had raw/jpg on the top panel? My 60D doesn't have that, either. One question though. Why would you shoot JPG, sometimes? I haven't been able to go back to JPG, even with as good as the 6D is with JPG files, raw offers more flexibility. And... if you are shooting raw, WB doesn't matter.
For quick access to raw/jpg you can set up the "SET" button to give instant access to all of the raw and jpg options. You can also use "Q" to see/change parameters like WB. It is also possible to set up the "INFO" button to show you the current shooting parameters. I like the "Q" button, but don't understand the single-function buttons of the 6D/60D bodies. The dual-function buttons of the 5D series just makes more sense.