I visited Dubai last week. I ordered my visa on line at
https://www.dubaivisaservice.com/index.php. They charged $170 Canadian and emailed me the visa in 2 days. I had a Subload ticket.
You have enough time to wait until 1 May and see if the agreement takes hold.