Yes. Read further in that same passage, where it talks about untyped bonuses. Action Surge and Battle Mage Action are both untyped bonuses, so they stack.
Actually, you're right! So subtract 3 from the first attack roll (it still hits, though). My mistake, and good catch. I'll remember that for the future.Edit: besides, Action surge only applies to the action you use to get another action.