You might try a compensating developer like D-23 or Diafine to keep the highlight densities from blowing out so bad. The star effect is going to be hard to get rid of, it's partly due to the lens too. A lens with more blades on the aperture tends to make a rounder hole and is less prone to the star.