An augmented seventh chord is a relative notion, because the Whole tone scale consists of only six degrees, so, the natural augmented seventh chord can't be built on its base. That's why augmented seventh chords should be viewed as altered diatonic seventh chords.
When you perform two octave Whole tone scale, or employ an extended position, you should use the below fingering (1, 2, 4).
There are two kinds of the diminished scale: "half step - whole step" and "whole step - half step". Names of these scales display principles of their constructions. The half - whole step diminished scale crosses an octave (twelve half tones) in the half - whole step "style", and the whole-half step scale - accordingly to its name. Both of these consist of eight degrees.
Fingerings for diminished scales do not go into one position, that's why you should always use transitions on every string or extended positions. This is a good training after the habit of playing diatonic scales in one fretboard location.