I am not actually against your proposition. It will definitely make the game better in terms of immersion and rule simplicity. It is overcomplicated as it is, imo. It could be simple and keep its quality.
+1