I love Wald, but if you want more E&M Misner, Throne, Wheeler is the book. It develops the basics of E&M with differential forms. The only other suggestion I have is Analysis, Manifolds and Physics by Choquet-Bruhat, DeWitt-Morette. They have a chapter in volume 1 where E&M is treated as a gauge theory on fibre bundles.
