I got the same set up as you but I ordered March 9th.
Originally it was supposed to arrive 3 weeks after I ordered, the end of March. My window is now May 9th - May 29th, but I've stopped checking everyday so I don't know if the delivery window has been moving.