Use the .338 with 210gr Nosler Partition or at least 225 grain of a non controlled expansion bullet.

The .338 is plenty for the deer and better on the elk.
The 7 is plenty for the deer and not as good on the elk. If you only had the 7 it would be fine, but the .338 is the better choice if you can shoot them both equally well.