Uno will not upload at 115200 Baud

No need to return - just put the proper bootloader on it, if you have an AVR ISP.

If not, you seem to have a workable solution.