Another option worth checking is getting a 60 day single entry tourist visa in Spain. You should find that at €35 it's cheaper than the extension (1900B), and as it's done entirely online it will probably be much more convenient than doing an extension in person in country, assuming you have the right paperwork. It also solves any issues with flight dates and boarding.
****************************