You have to be very careful when you change the cryptographic logic in IKEv2. Is the protocol you are proposing still secure?
It seems to me, at least at first glance, that the protocol may be open to some form of man-in-the-middle attack (or more precisely, "server in the middle"). Have you checked that?
At the functional (and security) level the identity of the server (and/or its certificate) seems to be missing in message 2. Is this just an overlook, or is it deliberate? In any case I would not like to assume that the client always has this cert in advance or that there is a single PK with which the server's signature is to be verified. Note that there may be, in principle, more than one server answering the client's request.
--Paul Hoffman, Director --VPN Consortium