Maybe someone have allready suggested this ... im not so active around here as in the past, so potentialy sory for duplicite post.
Anyway!
Today as i was running with Astarion around Shadow-cursed lands ... disarming and opening so many trapped crates, boxes, gates and i dont even know whatever else ... I got an idea:
Why do we need to click on object in order to disarm it ... and then right-click on it again, in order to lockpick it?I mean ...
What else would we do?

And its even both Sleight of Hand ... so its quite safe to asume that we would like to use same character for the job ... there is no need to prolong the process (or at very least i havent find any)!
Therefore my humble suggetion to make game flow a bit more naturally:
PLEASE, let us start lockpicking right after we disarm the trap!
Personaly i imagine it like this:
- Object is trapped ...
- Right click > disarming window, as we know it ...
- Disarm sucessfulls > "continue" button shows as we know it ...
- BUT NOW!!! Right next to it, there will be another button called "lockpick" that would lead us back to dicerolling.
Tada! 
Thanks for reading.