I don't intend hogging this one so i'll content myself with being helpful.
the prime nos are...1013, 1019, 1033, 1049, 1151, 1193, 1231 and 1249.
the non primes are....1003, 1007, 1027, 1121, 1139, 1157,1241, and 1261.
the clues that have the defs switched are..
prime - 1013 and 1151
non prime - 1027 and 1241.
I've done 14 of the 16 clues,lol.