Shameless plug opportunity! On the topic of "more complication on top of cloudformation", I made a tool that lets you split up cloudformation files with import syntax.

https://github.com/magicmark/cf-merge