Yes make the signals one way. Also stations have their own signals at each end of the platform although we can’t see them, unfortunately this does cause some troubles with train routing as well.
The most foolproof way to do it is either double track everything including the stations and never have the lines cross, or one-way signal a line and have the end loop out from the station and back to rejoin the return line.