you wish to increase your borrowing term by 5 years? and your fixed term upped by 3 years. It may be worth asking the lender "just as a general enquiry" and seeing what the difference in terms of costs average out to. It is dependant on the lender whether they would process a new application or just alter your existing one.
Its always worth a general enquiry to the lender