Yes, you need file both 140s for EB2 and EB3

If I140 EB3 is not approved, the PD of EB3 can't be carried over to EB2.

So file both I140s. When both approved, use the EB3 PD and EB2 I140 to file 485 if it desires.