Good morning,
At first the system seems balanced. I wouldn't change anything in terms of functionality. Another thing is the personal opinion about the manufacturer or the layout of some modules. But this is already an opinion that does not influence the results you want to obtain. Good luck!