Tune the queries should always be the first option. Deadlocks are primarily a performance related issue.

Another option is to look at using one of the snapshot isolation levels, read_committed_snapshot for example. This adds additional load to the tempdb, but radically reduces locking without getting into all the issues around NOLOCK.

Listen to Kevin. Don't use NOLOCK as a solution. It's a dangerous possibility for your business data.