Your visa expires on the 25.06.07. Therefore, you will have a short illegal stay in Switzerland. Therefore, you should extend your visa.

If you get the wrong border cop on the wrong day you could find yourself fined and / or barred from returning to Switzerland .