I've got no idea about any of those books I'm sorry, but something else came to mind. I have no clue however if it's any good, but I'm sure it's worth something.
Since it's really short ones your doing, 4 measures each-
You should just compose your own~
Take a big piece of paper, make it into some pieces, write a note on each paper, so you get all the notes in an octave, then fold them.
Take another paper, make a flat, sharp and a doublesharp/flat sign on these 4 parts of paper, fold them.
Then just decide; this will be in the basscleff, pull out a piece and it's a C!!
Take one from the other pile, it's going to be C flat!
Put it on the sheetpaper marked as C flat in the basscleff, perferably in the littleoctave register and the G cleff in the 1 stroke octave register. (whatever it's called in english)
And perhaps you can write chords aswell, and then on another piece make it a "block" or a "broken/arpegiated" chord.
Expand this process how far you want-
I'm guessing this will first of all make you put notes in their correct place, and tomorrow when you take your composed excercise, and you get it done. I'm sure it's gonna sound, well say. Funny.
Well, this was just a thought that came to mind in the moment of reading your post