That's a whole lot better! Its not quite the context aware method i had suggested. But adding the hotkeys to the corner menu really works well to make choosing an action less tedious.
The new grab range feels nice too. I do think it would still benefit from a single click pickup rather than click and drag. But overall the improvements feel really nice.