Make the edit interface something like this:
- On new annotation, show a list of options
- Text/Wikitext
- Thing (Wikipedia/Wikidata item)
- Commons Category
- Picture
- Switch to ProcessDialog frame with tabs for each type - this is where the edit interface starts
- Text/wikitext is existing form
- Thing is search on WP/WD for a title
- Commons Category is search on Commons for category name
- Picture is media search (cf. VE?)
- Obviously save/cancel as usual
Not necessary for beta release, let's test in a real environment and then move on to editing things more conveniently.