Change Powerpivot data sources and keep connection to charts, tables in spreadsheet

I have moved from Excel 2013 to Excel 2016 and I falled on one major incompatibility tied to POWERPIVOT.

I was using Excel files sources as data source but in the QUERY MODE.
Excel 2016 doesn't support QUERY MODE but only TABLE PREVIEW.
When connection to an Excel workbook with Excel 2016, you only have TABLE PREVIEW.

I would like to change the source of data by replacing existing connection (QUERY MODE) to a new connection (TABLE PREVIEW) without loosing all the connections to charts, tables in spreadheet...
If I was loosing all connections to charts and tables in spreadsheet, this would be a huge job.

To complicate the problem, I had added some calculated columns in my data source and some relationships to other sources.
Restarting from scratch is a nightmare.

Changing the source of the connection doesn't allow me to move back to TABLE PREVIEW.

Is there a clever way to solve my problem?

J.

maybe download and install latest version of PowerBi

Hi,
I may use PowerBi, I may use Qlikview or any other powerfull business intelligence tool.
I am first looking for compatibility when software upgrade (Excel 2013 to Excel 2016) to avoid redoing the job.
And in my case, the dashboard I have built is relativly complex.
So, let's look a solution within Excel environment.
Looking forward a solution from a member ot this forum.
I can not imagine to be the only Excel user facing this issue
J.