Toe-in is definetly forward edge closer that trailing... otherwise it would be called toe-out.

On a Hobie 14, 16 etc. we go 1/8" to 1/4" toe in.

Rudder rake should be adjusted to leave a slight weather helm on any tack. That way the boat has a constant load on the tiller and the boat will round up slightly if you drop the tiller.