Yes it should have a celotex upstand, you don't really need to tape the insulation joints if there's a membrane above. If your cowboy isn't going to fix it and your useless private inspector is a dickhead then some squirty foam in the gaps is better than nothing but it's really not right. It's...