The way Baalborn did that is pretty much how I'd like to see all the combat scenes.  Just roll the dice ahead of time and such.  That should help things move much faster.  Also don't forget about the +10 from the Oath of Knowledge.