I have done this before, and even if I haven't ran your numbers, it doesn't sound completely out of line...

What you have to remember is that there will be some additional taxes for you and your companion, but also that the infant won't be covered using the GUF2, but rather will pay a cost of 10% of the cash ticket for CW (the class you are upgrading to), rather than PE...