Effective motion-compensated prediction is the key to high-performance video coding. To ensure continuous improvement of video coders, emerging motion-compensation technologies will need to be successfully integrated into future standards. Higher order elastic motion models and geometry-adaptive block partitioning are such advanced techniques that are good candidates for integration into future generations of video coders. However, it is vital that these techniques are additive in performance, non-interfering and maintain justifiable complexity. In this paper, we propose an efficient block-partitioning scheme that incorporates both geometry-adaptive partitioning and an elastic motion model as extensions to the standard motion estimation procedure. Our experiments suggest that geometric partitioning in combination with the use of an elastic motion model can provide enhanced performance, although the increased complexity is of some concern for real-time applications.