Jon,
If you are not using the same form for new and edit you can use -on_submit instead of -new_data/-edit_data.
-select_query_name should work fine, but again works along with the key field to select the row that is to be updated. The key field ties in with the state-management of ad_form.