Should I file 2017 tax return with two RMDs (2016 and 2017) and form 5329 or should I file an amendment to 2016 tax return and form 5329?
