Personally I like your first scenario but I don't think Pioli shares in that belief. I honestly don't believe they will take a qb in the draft this year in any round. I wouldn't be shocked to see Pioli trade our first round pick back for more "value".
Looking at what I "think" they are trying to do is make this year about the trenches. We can go with our offensive playmakers and our defensive secondary we are needing the lines to catch up with them.