That does not sound so nice.
You can try to add the device using "Automatic" instead of "Guide me" as this might help
(note: you will have to unpair the device first; either by using Settings>Package Controller>Zwave Package>Exclude and following the exclude step in the device manual, or by forcing the device to unpair which often is described in the device manual).
I have not managed to reproduce the problem with the devices we currently have, so I have no other quick solution for you now. (The next update will have a more fault tolerant inclusion process, but that is of little help for you today.)
Also, some minutes is not ~30 minutes Some minutes is somewhere below 5 minutes, depending on how much functionality the device has.