B is the cleanest. I'd even consider tucking away the address type section a bit, maybe into a collapsed section or something like that.