Note Exercise, Guitar

[pabuhr]

I'm creating a simple note exercise for guitar students (see below).

I have 3 problems:

1. The lyric underscores are too close to the low E so there is no room to
   write the note name. How do I add extra padding (spacing) between the staff
   and the lyrics?

2. How do I "tweak" the vocalName under the treble clef rather than have it
   outside the staff lines?

3. How do I repeat the vocalName at the start of each lyric line rather than
   just having the vocalName on the first line?

Any suggests on how to do this better, would also be appreciated.

=============================================================================

\version "2.16.0"
\language english
#(set-global-staff-size 28)

\paper {
    #(set-paper-size "letter")
    top-margin = 0.75\in
    markup-system-spacing #'padding = #3 % spacing between title and staff
    bottom-margin = 1.25\in
    ragged-last-bottom = ##f
    tagline = ##f
} % paper

\layout {
    \pointAndClickOff
    \override Score.LyricText #'font-size = #3
    \override Score.vocalName #'direction = #'(left)
    \override Score.vocalName #'X-offset = #5
    indent = 0
    \context {
        \Staff
        \remove "Time_signature_engraver"
    } % context
\include "music/scales.ly"
} % layout

\header {
    title = \markup {\fontsize #-2 "Note Exercise: 1st Position, Form 3" }
    enteredby = "Peter Buhr"
} % header

melody = \relative c {
    \cadenzaOn
    e, a d g b e \bar "|" \break  % string names (standard tuning)
    e,, f g a b c d e f g a b c d e f g \bar "|" \break     % all notes in 1st 
position
    e g d c e f g e b d c g' f d c f \bar "|" \break  % top 6 notes (c-g), 
random
    e, g f a b f a g e f a e b' a e f \bar "|" \break  % middle 6 notes (b-e), 
random
    d c g d' b e, a f c' d f, g a c e, d' \bar "|" \break  % bottom 7 notes 
(d-E), random
} % melody

verseA = \lyricmode {
    \set vocalName = \markup {\fontsize #-2 "Note"}
    \repeat unfold 6 {"_"}
    \repeat unfold 17 {"_"}
    \repeat unfold 3 {
        \repeat unfold 16 {"_"}
    }
} % verseA

verseB = \lyricmode {
    \set vocalName = \markup {\fontsize #-2 "Fret#"}
    \repeat unfold 6 {"_"}
    \repeat unfold 17 {"_"}
    \repeat unfold 3 {
        \repeat unfold 16 {"_"}
    }
} % verseA

\score {
    <<
        \context Voice = one {
            \clef "treble_8"
            \melody
        }
        \lyricsto "one" \new Lyrics \verseA
        \lyricsto "one" \new Lyrics \verseB
    >>
} % score

% Local Variables: %
% tab-width: 4 %
% compile-command: "lilypond --ps NoteName.ly" %
% End: %