The Tubelectric in JJ2 is already a remix of the one in JJ1 so it shouldn't count. On the other hand, yes, Water Level is a remix of the Metroid 1 title theme... That's no coincidence since it's mentioned in the mod file from Lori Central. If so, then... uh, then putting a remix of Water Level on The American Album is a mistake because the composer of the Metroid theme is Japanese!