Glad you like #2!
Regarding #1, that's why I also suggest using a separate key, so you can shift-queue but still cancel the action last second. The reason for this suggestion is to allow scout to queue his skills for a guaranteed lock-down (ult -> leap -> detonate -> items -> attack). Similar to the way Magmus would shift-queue against an enemy carry or anti-initiator (ult -> PK -> sheepstick).