Beyond the Effective Index Method: Improved Accuracy for 2D Simulations of Photonic Crystal Waveguides