Definitely not the window lock.
SO. Caved and took it in to my mechanic where he tried a bunch of different things and ultimately discovered that there was a short in the switch that was telling the window to keep going up, even when it was completely up- this eventually caused the window motor to burn out. Replaced driver side switch, passenger side switch, and window motor. Hopefully this is helpful if anyone else has a similar problem...