Hi Aaliyah,
Yes you are more than welcome to address the design areas in any way you’d like. It’s great that you’ve pointed out the effect of one system on the others and therefore working on drainage may secondarily improve the tracks and crossings.
Good luck with everything.
Kind regards,
Evelyn