I agree - go with California Grill. Don't obsess about getting a window seat either. When the fireworks start, go out to the Observation Deck for the best view.
As for timing, making a reservation about 1 hour before Wishes worked out well for us.
Be warned that you will need to give a credit card when making ADRs for California Grill and will be charged $20 a person if you are a no show.