I think the second adjustment (only granting this feature to the passing player) should really be non-controversial indeed.
The first one is a bit less obvious, but I think I’d be fine with it as well.
However I don’t think this would change anything for OP’s problem? Am I missing something?