Looks like everything SHOULD work fine, but i think you should replace the switch with the router you have there, just make sure there is enough ports. And you dont need 2 access points, unless they are across an entire building, just make sure that each access point's channel is different. To ensure there is no channel interference make sure that one access point is broadcasting on channel 1 while the other is on channel 6. If they are both in close proximity though, you should only need one, just boost the power or increase the broadcast range of the one access point so it reaches where ever you need it to. You do not need to get rid of the switch, but its advisible to use a router instead, as it will be able to do alot more with the packets and it will be easier to log your wireless / wired devices in its MAC table.