Finally - a solution that makes sense.
So as described in my first post of this thread my 6315 (I also have a 6365 which works fine) sometimes after SR the WiFi remains OFF but sometimes it comes ON, without having the capability to turn it OFF. In that state the connectivity icon shows just the G for the GPRS capability but the WiFi Led blinks orange.
When that happens go to Settings - System and run the Self Test program. Now cancel the V in all the tests except WiFi. Run the test and wait 15 seconds. Nothing will happen - it will not ask you to turn WiFi on since the program think it's actually on. Now OK the program and it will close. Make sure it is fully closed and not just minimized - I have SPB pocket plus so mine closes. After that The WiFi antenna will appear in the connectivity icon and you'll be able to turn WiFi OFF.
I'm happy

__________________
Bary.