Well as far as is square better than straight...I don't think there really is a difference...just different mfg. Personally, I always go with square because they seem to be more readily available. Also, it seems like the cheaper (quality and price) units are usually straight pin.
I like waterproof if there is no lens covering the bulb...for obvious reasons.
Mike