BBMaps problem and OS 8520

Hi
Here's the situation.
I just got the new Blackberry Curve 8520 from Fido Canada.
I have EDGE and when I'm on my wifi I have UMA. Basically, I get my emails and instant messaging(msn,yahoo,gtalk) and bbmessenger.
Also when I'm on wifi I can browse, etc.
What's important is that I can also use BBMAPS when I'm on wifi(UMA)
That's when I'm on the original Fido OS 4.6.1.320

The turning point is when I loaded the Wind Hellas 5.0.0.509 OS
the BBMAPS wouldnt load the maps when I'm on wifi (UMA) which is the case of the 4.6 OS

Whats the problem? I want to use the OS 5 but I dont want to lose my BBmap ability :mad::confused:

Oh ya, PS: google maps dosen't work on my original 4.6 OS neither the 5 OS. I think its because I dont have a data plan only the (unlimited email, instant messaging, BBmessenger plan) -- correct me if I'm wrong

anyone can help?