Agreed, the only thing i would suggest is roboRio direct to Wireless and then personally I would use one of these switches for other things such as a computer to do vision processing, IP camera etc.
https://www.amazon.com/NETGEAR-ProSA...0000BVYT3?th=1
That way your main robot functions wont get knocked out if the switch has any issues or loses power etc.