Electrical engineering is a good match. The physics will help to understand the underlying principles of electrical engineering, particularly E&M and the quantum physics and materials behind transistors.
-
Mechanical engineering or engineering physics :) , it will help in application of knowledge which is acquired in physics .. :)