I was thinking the same thing as astroprof. When you say "E&M" and "QM" for Option B, I'm not sure if you mean just one course or it was just shorthand for "the 2 standard courses in E&M and the 2 standard courses in QM". I know that some departments are not able to offer all of the courses.
To help you decide if your current course plan covers enough QM and E&M as most 4-year Physics programs in North America, I've copied and pasted the course description of these courses below. Of course, it shouldn't match exactly, but it should help you determine how your courses compare. You can also search other universities to see what they teach too.
First upper level E&M course: "Maxwell's equations and their applications, electrical fields and potentials of static charge distributions, current, fields of moving charges, magnetic fields, electromagnetic induction." My course used the first half of Griffith's EM book.
Second upper level E&M course: "Applications of Maxwell's theory. Wave propagation in dielectrics, conductors and plasmas, wave guides, radiation, antennae, and special relativity." My course used the second half of Griffith's EM book.
First upper level QM course: "Principles and applications of quantum mechanics, wave mechanics, the Schroedinger equation, expectation values, Hermitian operators, commuting observables, one-dimensional systems, harmonic oscillators, angular momentum, three dimensional systems, time dependent perturbations." My course used the first half of Griffith's QM book.
Second upper level QM course: "Spin and angular momentum addition, perturbation methods, and applications in the fields of Atomic, Molecular, Nuclear, and Solid State Physics."
Hope it's helpful!