Unfortunately I don't think it will be practical to change point 1, otherwise you could abuse the opportunity attack system.