The S60 and S85 show the same 380 HP but the S85 is about 400 pounds heavier and is .5 quicker 0-60. Based on this the actual HP on the S85 must be higher. It's also about 8% less efficient on range per battery size. EV Trip Planner shows weight has little affect on range. So if range isn't affected much by weight then the main difference must be the higher HP of the S85. If this is the case the range of the P85D should improve if it runs on the 221 HP motor only.