Both will suffer challenges from some, but I suggest #2 if you must (though I would use 'was'). Actually, I would recast and avoid the whole dilemma: You saved me from drowning...
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.