Yep, pop along to Immgration and they will move your extension to the new passport and the re-entry, (pretty sure about the re-entry), the only proviso being that you use the same office that issued them both.
secondly, tell him to get the Non-O visa before he comes to Thailand, so much easier to open the bank account he will need to season the money, (even harder for Americans)