Multi-Agent Pathfinding with Matching using Enhanced Partial Expansion A*