An Improved Magnetic Map of the Milky Way, with the Circularly Orbiting Gas and Magnetic Field Lines Crossing the Dusty Stellar Spiral Arms