Improved Space Focusing of Polar Diatomic Molecules in a System of Quadrupole and Hexapole Fields