the option 1 you mentioned will do the job. the registered device bypass the CWP.
the option 2 you mentioned will change the registration duration
My approach would be:
Create new connection profile and list of MACs there. In the connection profile you can define what will happen to those MACs.