Yeah, the lack of numbers after E is what's causing the Egg move issues. For instance, Pidgey can currently have all of Faint Attack, Foresight, Pursuit, and Steel Wing on one set because they're all just 2E. It should be Faint Attack (2E0, 2E1), Foresight (2E0), Pursuit (2E1, 2E2), and Steel Wing (2E2), making the only possible combinations Faint Attack + Foresight, Faint Attack + Pursuit, and Pursuit + Steel Wing.