BlackBerry Development for OS6 platform to connect with SAP Backend

Hello, We have developed BlackBerry code on OS5 platform which works perfectly fine on DATA and WIFI plan Plus it works perfectly fine on OS6 platform (BUT ONLY ON WIFI). When we run the code/app on OS6 platform on the Data network, it just freezes. Our App connects works as a Front End application to the back end code that we have in the SAP system. So these backend code is available as Web Service to the front end Blackberry application. As explained, works fine on OS5 (data and wifi) and OS6 (wifi) but freezes on DATA network for all Blackberry phones which are on Blackberry Plan. If we run the same app on PDA plan, then it even works on Data plan of OS6, however we need to make it run on OS6 (data and wifi), plus ofcourse OS7 will release soon and we dont want to keep writing new code to work with every version. Hope i am able to explain my problem. Interested parties, please email me if you can do it or not and what do you need from us in order to do a trial run. Past experience with OS6 Blackberry code that works over Data and Wifi is needed to get into this. We have the code, so it wont take much time to fix one section and we can do the rest . Thanks AK