The shape of the dorsal fin, attack strategy (lunging), swimming style, prey (marlin) and slender nose make me think it was probably a big mako.
No time to watch the video (I'm at work) but as for prey, great whites here off SoCal are known to take giant sea bass (weight ranges up to 600-800 pounds). Local fishermen off Catalina have documented thisd at least twice and I've observed and filmed giant sea bass with huge oval scars on their dorsal side and flanks that suggest an attack by a very large shark. Of course makos up to about 14 ft have been reported in our nearshore waters.