I did not test it yet. As you already wrote in your post, the workaround is quite ugly ;) So we rather decided to keep on going with M4 since everything seems to run fine on it.
But back to topic: do you think switching to Final has any effects on the actual problem I opened this thread for (setting the soap:address location in the WSDL)?