I was there on my Dad's boat. front row seats to that waterfall. By far the best show I have seen. Good call.

I have never gone there but can you see the fireworks from Treasure Island? May be a pretty good spot since the base is now gone and it is public land. Not sure how crouded it will get.

Also, there are a few dinners on top of a revolving, top story building that afford you a great view. Do not know the name of the place though.