Finally got iTunes to mostly copy my music over from the laptop via an external hard drive, mostly following this method (but also having to go in and choose a folder). And scrobbling is working, too. Now to see if the new iPhone recognizes this library…