If you can get your hands on IMR4895 it'll work for both. The 123gr. and heavier in the 6mm and just about the full spectrum in the 7mm.
Since you live in NoCal have you tried Huntington Die Specialties in Oroville, Ca.
I've bought bullets from them before, I don't know what powder they may...