Batting Out of Order

 
Batting Order:
Andy
Baker
Charlie
Dan
Evan
Fred
 
In the top of the 5th inning, Andy grounds out for the first out, then Baker pops up for the second out, and then Dan pops up for the third out (yes, Charlie was skipped).
 
In the top of the 6th inning, Charlie leads off and pops out for the first out -- then Evan (with a 2-2 count) singles. At this point, the defense calls "time" and declares that we have a "massive" batting-out-order situation.
 
So, with one out and Evan standing on first base, what does the umpire do now? Who is out and who should be the next to bat?
 
Bonus Question: Using the same situation as above, what are the umpire actions if the defense discovers this "massive" batting-out-order situation while Evan is at bat with a 2-2 count?
 
Call
The situation below is not as "massive" as it may first appear. The first pitch to Evan "legalized" whoever last batted (Charlie). Since Dan should have followed Charlie (but did not), Dan is out. It is now Evan's turn at bat (since he follows Dan in the order) -- so we take Evan off of 1st base and put him at bat with two outs. (Note that all the mishaps of the previous inning are irrelevant).

Bonus Question: Evan is at the plate with a 2-2 count, but he is an improper batter. The umpire should get the proper batter to the plate (Dan) and Dan assumes the 2-2 count (now that was easy).