New setup- 340 based 416, 360 based 387, or 360 based 408?

Alright guys, my 381” 360 based stroker with a stock bore 4” piston and 3.790” stroker crank had issues and is out of the car and apart… I can rebuild what I have and go 4.030 bore and 3.790” stroke for 387” but I can’t seem to find any off the shelf pistons for the 3.790 stroker crank and custom forged Pistons might be a big up charge…. I could go 4” stroker kit in either a 340 block or 360 roller block that I have with an off the shelf piston by going to a 4” stoker crank… I have ported 53cc closed chamber w2 race heads and the goal is to go 10.5:1 to 11:1 compression as well as about 540hp so it’ll need 15-20cc ish dished pistons. Current 3.790 stroker setup is on reworked stock rods and Forged stroker crank.
Roller 360 block, 4" stroke will be all shelf parts. That's the route I'd go. Decent cam and basic home port job on the W2s and your goal is easily attainable