As for the Willow and Riley one shots not being included in the Library editions, of course they will. Why on earth wouldn't they when they're in the TPBs?
I wouldn't trust Wiki's descriptions for a start, and the main reason is the Willow tale was in TPB 7, and the Riley tale in TPB 8.
Volumes 7 & 8 will make up the 4th and final Library edition, which has yet to be announced anyway (with the 2nd out September 12th, and the 3rd out December 12th.) Look on the Dark Horse website.