I was in similar situation and traveled to Dubai twice.:(

Dubai airport is large, but its depends on the terminal. The one for flydubai is tiny and no boarding bridge like Doha airport.

BTW, are u Canadian? Canadian passport holders cannot get on-arrival visa to enter UAE since Jan 2011.
Still be able to get Bahrain visa on arrival but cost 5BHD.