Suggestion, what about making it:

Click on album: Short click=open album, long click play-menu (like now).

Click on track: Single click=Play on computer or local (default is setup in settings)

Long Click= menu with download and play on computer or local (default opposite as in short click)