4S was much better, but I think there's something wrong with my ESC or motor. The motor is rated for a 12x6 prop, like I'm currently using. But the motor doesn't seem to be spinning fast and it's coming down hot. Wish I had my wattmeter with me. I've calibrated the ESC a few times now, but nothing changes.
Edit: after doing some more research on my cheap motor, it looks like it's rated for a 12x6 on 2S. Anyone have a suggestion for a better motor? Available on Amazon would be nice, but not necessary