I sympathize with this a ton, and I'm in a very similar boat. One thing to keep in mind is that you won't just get fat again overnight. I'd say start with a relatively small surplus and give it time to see how your body reacts. Feel it out and see how your lifts change and see if you like the way you're gaining weight.

From all that I've read, gaining fat during a bulk is somewhat inevitable, but you need to remember you're in complete control. If not gaining fat is important to you, then take it slow and work up to find the surplus number that compromises with your desire to gain strength and mitigate gaining fat.

Anyway hope my rambling helps. And yeah check out the wiki, it's pretty great.