The QOS 2 delivery description says the following:
"Figure 4.3 shows that there are two ways in which QoS 2 can be handled by the receiver. They differ in the point within the flow at which the message is made available for onward delivery. The choice of approach is implementation specific and does not affect the guarantees of a QoS 2 flow."
Unfortunately while it is true that if you choose one approach it doesn't affect the guarantee, it seems like if you mix the two then messages can be lost. An academic I know did a formal analysis and proved this (I'll find a reference for you).
Therefore I would recommend that we clarify this.