S7 = Galaxy S7, The Edge = S7 Edge. The edge has a bigger battery and screen than the S7.
You said "I wish the S7 had the screen size and battery size the edge has"
So are you saying you wish you had an S7 Edge? Because besides the actual edge, those are the literal differences between the two.