I started by pulling 1 bearing per cup to start and the problem is gone. When/if I find a nice looking headset I might try the n-2 and see if that makes a difference.

The reason the BB was notchy was lack of grease. I added more grease and 98% of the notchiness is gone.

Thanks for all the input!