Some deviations from the canon make me sad, but I rather found Moriarty more refreshing and (dare I say it?) possibly even deeper as a character so I'd probably choose Moriarty.

Though I would say Lestrade comes close behind.