With the short lengths of wire that we use in RC, I don't see there being a problem with soldering the diode on the ESC. In some respects it might be better to keep the diode away from a hot motor anyway. just my $.02
Brushes? We don't need no stinking brushes!!!