Near-Perfect Sorting of Orbital Angular Momentum and Angular Position States of Light