I have managed to change the viewport navigation shortcut too the following.
alt + right mouse to rotate view-port
shift +alt right mouse to pan view-port
They both work but in edit mode the pan view-port ceases to function their must be some conflicting shortcut in edit mode.
Possibly someone can help figure out what is the issue.
Thanks
Pe