I've never brewed an extract or partial mash beer, so I'm only offering some ideas that sprang into my mind when reading your post.
Brewing IMO as a preparation, has (for the most part) three steps: mash or partial mash, boil and ferment.
So, if I were in your situation, I'd boil my...