They should get rid of the second serve. It would improve the game as the first serve is completely no risk. No other shot has no risk. Therefore, it gives a massive advantage to tall, fast servers.
Take away the second serve and they can still try those massive serves, but at least there is some risk.