I vote #1.

What would be better tho, imo,is to just remove player to player collision 100% while in non-combat zones(IE-Towns, airships, etc.).