1. Combine 1/4 cup olive oil and next 7 ingredients in a large bowl, and toss well. Cover with plastic wrap, and chill at least 2 hours or up to 6 hours.
2. Preheat oven to 450º. Place a 15- x 10-inch jellyroll pan in oven 10 minutes or until extremely hot. Carefully spread shrimp in a single layer across pan. Bake 8 minutes, stirring once halfway through cooking.
3. Remove from oven, and immediately add stock or water, butter, and remaining 2 tablespoons olive oil to pan. Stir well. Serve in shallow bowls with good bread and cold beer or dry German Riesling.