So we have a talented individual who likes to overthink a little? Don't worry OP, many of us have been there also, and most aren't even talented.
So my advice is this: find some local coach/powerlifting (or WL) community and join there. You'll get advice/insight that will help you a lot. If you choose to do 5/3/1 (which is a very good program), do it as written.
Also, don't ask people to tweak their program when it hurts the basic principles they have built in it.
Besides of that. Go forward and take that 1st place!