Good advice, if it's possible. The cost of the battery replacement should be more than offset by savings when purchasing the 6P later in the summer (when it should be priced cheaper than now).

EDIT: But you said the screen was also going a bit wonky, so.. maybe sooner than later.