sorry just read the rest of your thread... as a work around, you can advertise the task to your desktop collection, but have the task respond ONLY to PXE and MEDIA, have it set to AVAILABLE and put a password on your boot media.
MEDIA and PXE only, available setting and the password are all items to prevent current devices from getting reimaged by accident.