It's been a while since I went through my Heian-to-Tokugawa Japanese phase, but I recall Donald Keene having some rather good books on Japanese literature, some of which are
now available in e-book and non-Agency, so you can use discount coupons to take the prices down further if you
get them from Kobo.
He covered haiku, waka, renga, and other classical forms in his various anthologies of Japanese literature, which IIRC also had some nice historical background essays/commentary on the art forms and the artists.
I'm a bit fuzzy on the titles, but I think that
"Seeds in the Heart" (apparently not e-booked) was the major one I checked out of the library which had that stuff. He's got
plenty of print-only volumes out, so probably browsing through Amazon's Look Inside feature to see if there's anything which particularly grabs you is the best bet if you're willing to splurge or can raid a well stocked library.
Hope this helps.