Hi Leighton,
The amplifier appears to be exactly as you describe. Here is a picture from the Gibson AA catalog of 1939 and a picture of your amp. They match nicely.
However, the guitar does not appear to be a ES-150. Again, here is the ES-150 pictured in the AA catalog and a couple of pictures of your guitar:
Ron's point about the pickup is accurate. Not only is it in the wrong place, but it doesn't look like a Gibson pup. The other thing that confuses me about the guitar is the logo. I am not a Gibson expert but both the script and orientation of the logo on the headstock doesn't look right. The logos of this era that I'm familiar with use a looped G and are oriented diagonally across the top of the headstock. Refer to the script used on your amp logo, the guitar script should look about the same. Notice how the script of your logo differs and is oriented horizontally. I'm sure this alone is enough to tell a Gibson expert what's going on here, but like I say, I'm not a Gibson expert.
I'm wondering if the guitar is an acoustic carve top in which someone has added a pup. There are numerous differences between the ES-150 in the catalog and your guitar. I think the Gibson AA catalog was used from 1939 til the war, so it is unlikely that the differences are due to different model years.
Does anyone out there know whether Gibson every used a logo like this and perhaps the years in which it was used. I think this will be key to learning something about your guitar Leighton. For now, all I can say is I don't believe it is an ES-150.