New AP vs.New Modem/Router

To improve security should I replace my Wireless AP on my Wireless AP/Router-Modem/8wayEthernet Switch/PC and wireless Laptop system or change my whole system to have a Wireless Router/Modem and WirelessPC and Wireless Laptop; ensuring AP or Wireless Router have WP2A Encryption.