VS2019 DataSet Designer Mangling INSERT queries - Removing RETURNING statements

Question

Yes, it's 2021 and I am still using DataSets, But. it still works mostly...

However, I am having an issue that is slowly driving me crazy. I have several projects using PostgreSQL database and DataSets. The issue causing me grief is that while using MS SQL Server databases, tables with identity keys have no issues in updating the DataTable and returning the keys following the update. With postgres, we need to add a RETURNING id statement at the end of the INSERT query or use a SELECT currval(). Which by itself is fine. But, if you then edit the DataTable in any fashion (add a query to it for example), it trumps the insert query and turfs the parameter provided to handle the return value.

Is there any known way around this, or am I missing something simple? For the previous 20 years I worked almost exclusively with MS SQL Server and it just works...

Thanks in advance!