If I understand you correctly, you received a 1099-R for a trustee-to-trustee rollover, and the distribution code was not G. So you have asked for a corrected 1099-R.
This answer assumes that the above is true.
"What others figures/boxes to I change?" - None, enter the corrected 1099-R exactly as is.
"I get tax $ back too?" - that depends on many other factors on your return.
"how do I fix this while waiting for corrected 1099R?" - what is there to fix besides remove the 1099-R that will be corrected?
Note that you should wait until you receive the corrected 1099-R, because there are occasions in which a taxpayer thinks that a transaction is a rollover but it is not in the eyes of the IRS and the fund custodian. For example, if a taxpayer remove $X from a fund with the intention of contributing it within 60 days to another retirement fund, many taxpayers call it a "rollover" but the distribution code on the 1099-R is "7", not "G".
"G" is used only if the transfer is a trustee-to-trustee transfer, not if the taxpayer is the intermediary.
