Yeah, the extra target switch is separate for a technical reason; you're not supposed to be able to reach it in normal gameplay! The other target is separate from the one when the level is right side up as a necessity, because IIRC the switches actually warp you far outside the main level to an upside down copy instead of actually turning you upside down.