You do not need to acid wash AND diamond grind. One or the other is done. However, diamond grinding is always better. And, considering the shape of the floor I would not even consider acid etching instead of grinding. Now, the steps:
1) degrease any areas that have had oil, fuel and or other...