You'll need to make the condition change on NPS, but also modify some things on the controller. Basically creating 2 server entries and 2 server groups. The difference being the nas-identifier field that is applied (to match your NPS policy). The names and nas-id are not specific and can be whatever you want; so long as they match up.
aaa authentication-server radius "NPS-WPA2-ENT"
nas-identifier "NPS-dot1x"
aaa authentication-server radius "NPS-MAC"
nas-identifier "NPS-MAC
aaa server-group "WPA2-ENT"
auth-server "NPS-WPA2-ENT"
aaa server-group "MAC-AUTH"
auth-server "NPS-MAC"
aaa profile "Your-AAA"
mac-server-group "MAC-AUTH"
dot1x-server-group "WPA2-ENT"