I've heard from a lot of people at certain companies who know that if they want a certain salary bump, they need to leave for a year or two and come back. So if you're still interested in your first organization, don't discount going back there. Generally, it's way easier to get hired the second time as you're a known commodity, and assuming you can demonstrate your skill improvement over that time period, you can get a 20-40% bump from your current job.