[Snawoot]

Have you considered use of WPA2 Enterprise? EAP-TLS can totally eliminate PSK and all of its problems without extreme approaches.