I agree with all of them, almost. The only change I'd make to number two is that if the team scores on the delayed penalty while their goalie is still on the ice, then they should still get the power play. If their goalie has left the ice for a 6th skater, then no power play. If the goalie is on the ice it's not really a man-advantage yet, so the non-penalized team should still get their chance to play with a true advantage.
It wouldn't take long to review some video after a goal to determine if the goalie had left the ice yet or not.