I think your deletion edit spec is the most reasonable and avoids a lot of the ux issues