Player sprite is incorrectly behind one tile and over another

I have a project here (the sprites are placeholders from a tutorial). The tilemap is in the same y-sort as the player, y-sort is enabled on the everything, the tile origin set to bottom-left, and the player's sprite position is offset so that the tile overhangs above the player when they're behind a wall and so the player overhangs the wall when they're in front of it. The only problem is if the player is high above one tile, the bottom of their sprite is overlapped and the top isn't: So I tried increasing the Z-Index on all tiles except for the bottom half of walls and it worked; the entire sprite is covered up when they're as high up as in the picture above, but then I noticed if I do a roll which raises the sprite's image a little, the top of the sprite gets cut off: Is their a way so the top doesn't get cut off like that, but the walls don't overlap half the sprite or can I not have it both ways.