I would suggest just having a hotbar you switch to manually for mounts/minions/repairing/etc. It took me a little bit of time to get used to mine but it is second nature now and it's convenient having a shared hotbar that doesn't impose on anything. Just make sure to take it out of the R1 rotation.