Matt,
Yeah, it was a bit of a bear.
You'll need to work with Dennis and the BASIS team to make sure that all UI5, REST, ODATA and HTML components are at the correct service pack level based on the version of NetWeaver you have. Did a lot of iterative work on this with a friend of mine who is more of a BASIS person than me.
If all of that is up to snuff, I think there was one bit of tweaking I needed to do. If you need it, call me and I'll help you through it. (No strings attached! 
)
Hope it helps!
Matt